XBMC Media Center

The branch, master has been updated
       via  608efadad91713f9f44574f5cdc094482a0267e5 (commit)
       via  146b49ec09c1fcb9f1d654884ce3daac4d692c53 (commit)
      from  537bec4a5e297cd5d2ebe83d50ae5ee4c0ab5b07 (commit)

https://github.com/xbmc/xbmc/commit/608efadad91713f9f44574f5cdc094482a0267e5

commit 608efadad91713f9f44574f5cdc094482a0267e5
Merge: 537bec4 146b49e
Author: Sascha Montellese <sascha.montellese@...>
Date:   Sun Jun 17 00:31:27 2012 -0700

    Merge pull request #1076 from Montellese/onvolumechanged_fix
    
    jsonrpc: fix OnVolumeChanged notifications after AE merge

diff --cc xbmc/Application.cpp
index e5759d0,705ff6e..bf6537e
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@@ -5178,8 -5184,9 +5178,9 @@@ void CApplication::Mute(
    if (g_peripherals.Mute())
      return;
  
 -  CAEFactory::AE->SetMute(true);
 +  CAEFactory::SetMute(true);
    g_settings.m_bMute = true;
+   VolumeChanged();
  }
  
  void CApplication::UnMute()
@@@ -5187,8 -5194,9 +5188,9 @@@
    if (g_peripherals.UnMute())
      return;
  
 -  CAEFactory::AE->SetMute(false);
 +  CAEFactory::SetMute(false);
    g_settings.m_bMute = false;
+   VolumeChanged();
  }
  
  void CApplication::SetVolume(float iValue, bool isPercentage/*=true*/)

https://github.com/xbmc/xbmc/commit/146b49ec09c1fcb9f1d654884ce3daac4d692c53

commit 146b49ec09c1fcb9f1d654884ce3daac4d692c53
Author: montellese <montellese@...>
Date:   Sat May 19 22:59:01 2012 +0200

    jsonrpc: fix OnVolumeChanged notifications after AE merge

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 639c621..705ff6e 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2684,7 +2684,7 @@ bool CApplication::OnAction(const CAction &action)
       else
         volume -= (float)fabs(action.GetAmount()) * action.GetAmount() * step;
 
-      SetHardwareVolume(volume);
+      SetVolume(volume, false);
     }
     // show visual feedback of volume change...
     ShowVolumeBar(&action);
@@ -5186,6 +5186,7 @@ void CApplication::Mute()
 
   CAEFactory::AE->SetMute(true);
   g_settings.m_bMute = true;
+  VolumeChanged();
 }
 
 void CApplication::UnMute()
@@ -5195,6 +5196,7 @@ void CApplication::UnMute()
 
   CAEFactory::AE->SetMute(false);
   g_settings.m_bMute = false;
+  VolumeChanged();
 }
 
 void CApplication::SetVolume(float iValue, bool isPercentage/*=true*/)
@@ -5205,11 +5207,7 @@ void CApplication::SetVolume(float iValue, bool isPercentage/*=true*/)
     hardwareVolume /= 100.0f;
 
   SetHardwareVolume(hardwareVolume);
-
-  CVariant data(CVariant::VariantTypeObject);
-  data["volume"] = (int)(hardwareVolume * 100.0f + 0.5f);
-  data["muted"] = g_settings.m_bMute;
-  CAnnouncementManager::Announce(Application, "xbmc", "OnVolumeChanged", data);
+  VolumeChanged();
 }
 
 void CApplication::SetHardwareVolume(float hardwareVolume)
@@ -5235,6 +5233,14 @@ int CApplication::GetVolume() const
   return (int)(g_settings.m_fVolumeLevel * 100.0f);
 }
 
+void CApplication::VolumeChanged() const
+{
+  CVariant data(CVariant::VariantTypeObject);
+  data["volume"] = GetVolume();
+  data["muted"] = g_settings.m_bMute;
+  CAnnouncementManager::Announce(Application, "xbmc", "OnVolumeChanged", data);
+}
+
 int CApplication::GetSubtitleDelay() const
 {
   // converts subtitle delay to a percentage
diff --git a/xbmc/Application.h b/xbmc/Application.h
index f253b96..79ef883 100644
--- a/xbmc/Application.h
+++ b/xbmc/Application.h
@@ -410,6 +410,8 @@ protected:
   void UpdateLCD();
   void FatalErrorHandler(bool WindowSystemInitialized, bool MapDrives, bool InitNetwork);
 
+  void VolumeChanged() const;
+
   bool PlayStack(const CFileItem& item, bool bRestart);
   bool SwitchToFullScreen();
   bool ProcessMouse();

-----------------------------------------------------------------------

Summary of changes:
 xbmc/Application.cpp |   18 ++++++++++++------
 xbmc/Application.h   |    2 ++
 2 files changed, 14 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
[xbmc/xbmc]