[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sflphone-kde/contact_refactor] src: [ #44118 ] Fix video muting
From:       Emmanuel Lepage Vallee <emmanuel.lepage () savoirfairelinux ! com>
Date:       2014-03-31 21:20:02
Message-ID: E1WUjcg-0000Fd-Dm () scm ! kde ! org
[Download RAW message or body]

Git commit 2aef29af25cbe94894af7f4c8a562d42d98de6d1 by Emmanuel Lepage Vall=
ee.
Committed on 31/03/2014 at 21:19.
Pushed by lepagevalleeemmanuel into branch 'contact_refactor'.

[ #44118 ] Fix video muting

M  +1    -0    src/actioncollection.cpp
M  +1    -0    src/widgets/videodock.cpp
M  +1    -1    src/widgets/videoscene.cpp
M  +13   -0    src/widgets/videowidget3.cpp
M  +1    -0    src/widgets/videowidget3.h

http://commits.kde.org/sflphone-kde/2aef29af25cbe94894af7f4c8a562d42d98de6d1

diff --git a/src/actioncollection.cpp b/src/actioncollection.cpp
index 8870d4b..c95790d 100644
--- a/src/actioncollection.cpp
+++ b/src/actioncollection.cpp
@@ -118,6 +118,7 @@ ActionCollection::ActionCollection(QObject* parent) : Q=
Object(parent),m_pWizard(
    action_video_mute            ->setIcon(KIcon("camera-web"            ));
    action_video_preview         ->setIcon(KIcon("view-preview"          ));
    action_video_preview         ->setCheckable(true);
+   action_video_mute            ->setCheckable(true);
    #endif
 }
 =

diff --git a/src/widgets/videodock.cpp b/src/widgets/videodock.cpp
index 862f2dd..160d4ac 100644
--- a/src/widgets/videodock.cpp
+++ b/src/widgets/videodock.cpp
@@ -66,6 +66,7 @@ VideoDock::VideoDock(QWidget* parent) : QDockWidget(paren=
t)
    connect(ActionCollection::instance()->videoRotateLeftAction() ,SIGNAL(t=
riggered(bool)),m_pVideoWidet,SLOT(slotRotateLeft()));
    connect(ActionCollection::instance()->videoRotateRightAction(),SIGNAL(t=
riggered(bool)),m_pVideoWidet,SLOT(slotRotateRight()));
    connect(ActionCollection::instance()->videoPreviewAction()    ,SIGNAL(t=
riggered(bool)),m_pVideoWidet,SLOT(slotShowPreview(bool)));
+   connect(ActionCollection::instance()->videoMuteAction()       ,SIGNAL(t=
riggered(bool)),m_pVideoWidet,SLOT(slotMuteOutgoindVideo(bool)));
 }
 =

 ///Set current renderer
diff --git a/src/widgets/videoscene.cpp b/src/widgets/videoscene.cpp
index 47d13c9..a0df6ee 100644
--- a/src/widgets/videoscene.cpp
+++ b/src/widgets/videoscene.cpp
@@ -178,6 +178,6 @@ void VideoScene::slotRotateRight()
 =

 void VideoScene::slotShowPreview()
 {
-  =

+   =

 }
 =

diff --git a/src/widgets/videowidget3.cpp b/src/widgets/videowidget3.cpp
index ac17011..126e8ce 100644
--- a/src/widgets/videowidget3.cpp
+++ b/src/widgets/videowidget3.cpp
@@ -31,6 +31,8 @@
 #include <lib/videomodel.h>
 #include "videoscene.h"
 #include "videotoolbar.h"
+#include "actioncollection.h"
+#include "extendedaction.h"
 =

 =

 #ifndef GL_MULTISAMPLE
@@ -125,3 +127,14 @@ void VideoWidget3::slotShowPreview(bool show)
    }
 }
 =

+void VideoWidget3::slotMuteOutgoindVideo(bool mute)
+{
+   if (VideoModel::instance()->isPreviewing() && mute)
+      VideoModel::instance()->stopPreview();
+   else {
+      VideoModel::instance()->startPreview();
+      if (ActionCollection::instance()->videoPreviewAction()->isChecked())
+         slotShowPreview(true);
+   }
+}
+
diff --git a/src/widgets/videowidget3.h b/src/widgets/videowidget3.h
index 70d7a65..8aa82d1 100644
--- a/src/widgets/videowidget3.h
+++ b/src/widgets/videowidget3.h
@@ -54,6 +54,7 @@ public Q_SLOTS:
    void slotRotateLeft();
    void slotRotateRight();
    void slotShowPreview(bool show);
+   void slotMuteOutgoindVideo(bool mute);
 =

 Q_SIGNALS:
    void changed();
[prev in list] [next in list] [prev in thread] [next in thread]