From 7572c07bf016dbc020f17e37f5e53a1df953dd06 Mon Sep 17 00:00:00 2001
From: Aleksei Kanash <sc.kanash.aleksei@gmail.com>
Date: Mon, 6 Aug 2012 14:30:28 +0300
Subject: [PATCH] Fix for SANKORE-868. Insertion of sound/video (silent mode)
works proper now.
---
src/domain/UBGraphicsMediaItem.cpp | 6 ++++++
src/domain/UBGraphicsMediaItem.h | 1 +
src/domain/UBGraphicsMediaItemDelegate.cpp | 4 ++++
3 files changed, 11 insertions(+)
diff --git a/src/domain/UBGraphicsMediaItem.cpp b/src/domain/UBGraphicsMediaItem.cpp
index 222dff89..b64306d3 100644
--- a/src/domain/UBGraphicsMediaItem.cpp
+++ b/src/domain/UBGraphicsMediaItem.cpp
@@ -188,6 +188,12 @@ void UBGraphicsMediaItem::clearSource()
void UBGraphicsMediaItem::toggleMute()
{
mMuted = !mMuted;
+ setMute(mMuted);
+}
+
+void UBGraphicsMediaItem::setMute(bool bMute)
+{
+ mMuted = bMute;
mAudioOutput->setMuted(mMuted);
mMutedByUserAction = mMuted;
sIsMutedByDefault = mMuted;
diff --git a/src/domain/UBGraphicsMediaItem.h b/src/domain/UBGraphicsMediaItem.h
index 1fd164a4..8a226795 100644
--- a/src/domain/UBGraphicsMediaItem.h
+++ b/src/domain/UBGraphicsMediaItem.h
@@ -109,6 +109,7 @@ public:
public slots:
void toggleMute();
+ void setMute(bool bMute);
void activeSceneChanged();
void hasMediaChanged(bool hasMedia);
void showOnDisplayChanged(bool shown);
diff --git a/src/domain/UBGraphicsMediaItemDelegate.cpp b/src/domain/UBGraphicsMediaItemDelegate.cpp
index 54d702a0..8411be34 100644
--- a/src/domain/UBGraphicsMediaItemDelegate.cpp
+++ b/src/domain/UBGraphicsMediaItemDelegate.cpp
@@ -52,6 +52,10 @@ UBGraphicsMediaItemDelegate::UBGraphicsMediaItemDelegate(UBGraphicsMediaItem* pD
connect(mToolBarShowTimer, SIGNAL(timeout()), this, SLOT(hideToolBar()));
mToolBarShowTimer->setInterval(m_iToolBarShowingInterval);
}
+ if (delegated()->isMuted())
+ {
+ delegated()->setMute(true);
+ }
}
bool UBGraphicsMediaItemDelegate::mousePressEvent(QGraphicsSceneMouseEvent *event)
--
2.18.1