[cec] removed dupe methods. if we really need that Sleep(), do it in CPeripherals...

diff --git a/xbmc/peripherals/Peripherals.cpp b/xbmc/peripherals/Peripherals.cpp
index f770b6c..d63edce 100644 (file)
--- a/xbmc/peripherals/Peripherals.cpp
+++ b/xbmc/peripherals/Peripherals.cpp
@@ -606,9 +606,9 @@ bool CPeripherals::OnAction(const CAction &action)
         if (cecDevice && cecDevice->HasConnectedAudioSystem())
         {
           if (action.GetID() == ACTION_VOLUME_UP)
-            cecDevice->ScheduleVolumeUp();
+            cecDevice->VolumeUp();
           else
-            cecDevice->ScheduleVolumeDown();
+            cecDevice->VolumeDown();
           return true;
         }
       }
@@ -644,7 +644,7 @@ bool CPeripherals::ToggleMute(void)
       CPeripheralCecAdapter *cecDevice = (CPeripheralCecAdapter *) peripherals.at(iPeripheralPtr);
       if (cecDevice && cecDevice->HasConnectedAudioSystem())
       {
-        cecDevice->ScheduleMute();
+        cecDevice->ToggleMute();
         return true;
       }
     }

diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
index b1fc176..1447ebf 100644 (file)
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
@@ -448,33 +448,6 @@ void CPeripheralCecAdapter::SetAudioSystemConnected(bool bSetTo)
   m_bHasConnectedAudioSystem = bSetTo;
 }
 
-void CPeripheralCecAdapter::ScheduleVolumeUp(void)
-{
-  {
-    CSingleLock lock(m_critSection);
-    m_volumeChangeQueue.push(VOLUME_CHANGE_UP);
-  }
-  Sleep(5);
-}
-
-void CPeripheralCecAdapter::ScheduleVolumeDown(void)
-{
-  {
-    CSingleLock lock(m_critSection);
-    m_volumeChangeQueue.push(VOLUME_CHANGE_DOWN);
-  }
-  Sleep(5);
-}
-
-void CPeripheralCecAdapter::ScheduleMute(void)
-{
-  {
-    CSingleLock lock(m_critSection);
-    m_volumeChangeQueue.push(VOLUME_CHANGE_MUTE);
-  }
-  Sleep(5);
-}
-
 void CPeripheralCecAdapter::ProcessVolumeChange(void)
 {
   bool bSendRelease(false);
@@ -557,7 +530,7 @@ void CPeripheralCecAdapter::VolumeDown(void)
   }
 }
 
-void CPeripheralCecAdapter::Mute(void)
+void CPeripheralCecAdapter::ToggleMute(void)
 {
   if (HasConnectedAudioSystem())
   {

diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.h b/xbmc/peripherals/devices/PeripheralCecAdapter.h
index f89a017..bca0f7d 100644 (file)
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.h
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.h
@@ -92,12 +92,9 @@ namespace PERIPHERALS
     void Announce(ANNOUNCEMENT::AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data);
     bool HasConnectedAudioSystem(void);
     void SetAudioSystemConnected(bool bSetTo);
-    void ScheduleVolumeUp(void);
     void VolumeUp(void);
-    void ScheduleVolumeDown(void);
     void VolumeDown(void);
-    void ScheduleMute(void);
-    void Mute(void);
+    void ToggleMute(void);
     bool IsMuted(void);
 
     void OnSettingChanged(const CStdString &strChangedSetting);