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

List:       kde-commits
Subject:    =?utf-8?q?=5Bphonon/cleanup=5D_phonon=3A_Merge_branch_=27master?=
From:       Casian Andrei <skeletk13 () gmail ! com>
Date:       2011-03-09 19:40:57
Message-ID: 20110309194057.C7F2AA60B0 () git ! kde ! org
[Download RAW message or body]

Git commit 5fa4b90be7e3ba72bb920190a2eabaec686c77d3 by Casian Andrei.
Committed on 09/03/2011 at 20:36.
Pushed by casianandrei into branch 'cleanup'.

Merge branch 'master' into cleanup

Conflicts:
	phonon/globalconfig.cpp

I  +1    -1    CMakeLists.txt     
I  +20   -7    demos/simplecapture/capture.cpp     
I  +55   -6    demos/simplecapture/capture.h     
I  +3    -0    demos/simplecapture/main.cpp     
MM +3    -3    phonon/backendcapabilities.cpp     
I  +14   -4    phonon/experimental/avcapture.cpp     
I  +6    -2    phonon/experimental/avcapture.h     
I  +1    -1    phonon/experimental/tests/avcapturetest.cpp     
MM +0    -3    phonon/factory.cpp     
MM +161  -42   phonon/globalconfig.cpp     
I  +18   -10   phonon/globalconfig.h     
MM +12   -2    phonon/mediasource.cpp     
MM +6    -2    phonon/mediasource.h     
MM +1    -12   phonon/objectdescription.cpp     
MM +1    -15   phonon/objectdescription.h     
I  +22   -0    phonon/phononnamespace.cpp     
I  +41   -4    phonon/phononnamespace.h.in     
I  +7    -1    phonon/pulsesupport.cpp     
I  +3    -1    phonon/pulsesupport.h     

http://commits.kde.org/phonon/5fa4b90be7e3ba72bb920190a2eabaec686c77d3

diff --cc phonon/globalconfig.cpp
index c092d84,8112ca1..c1f14a0
--- a/phonon/globalconfig.cpp
+++ b/phonon/globalconfig.cpp
@@@ -93,7 -93,8 +93,7 @@@ static void filter(ObjectDescriptionTyp
      }
  }
  
- static QList<int> sortDevicesByCategoryPriority(const GlobalConfig *config, const \
QSettingsGroup *backendConfig, ObjectDescriptionType type, Phonon::Category category, \
                QList<int> &defaultList)
 -#ifndef QT_NO_PHONON_SETTINGSGROUP
+ static QList<int> sortDevicesByCategoryPriority(const GlobalConfig *config, const \
QSettingsGroup *backendConfig, ObjectDescriptionType type, Category category, \
QList<int> &defaultList)  {
      Q_ASSERT(config); Q_UNUSED(config);
      Q_ASSERT(backendConfig);
@@@ -314,9 -404,10 +395,9 @@@ void GlobalConfig::setAudioOutputDevice
      } else {
          backendConfig.setValue(QLatin1String("Category_") + \
QString::number(category), order);  }
 -#endif //QT_NO_PHONON_SETTINGSGROUP
  }
  
- QList<int> GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, int \
override) const + QList<int> GlobalConfig::audioOutputDeviceListFor(Category \
category, int override) const  {
      K_D(const GlobalConfig);
  
@@@ -375,8 -473,12 +456,8 @@@
  }
  
  
- int GlobalConfig::audioOutputDeviceFor(Phonon::Category category, int override) \
const + int GlobalConfig::audioOutputDeviceFor(Category category, int override) const
  {
 -#ifndef QT_NO_PHONON_SETTINGSGROUP
      QList<int> ret = audioOutputDeviceListFor(category, override);
      if (!ret.isEmpty())
          return ret.first();
@@@ -411,9 -514,10 +492,9 @@@ void GlobalConfig::setAudioCaptureDevic
      } else {
          backendConfig.setValue(QLatin1String("Category_") + \
QString::number(category), order);  }
 -#endif //QT_NO_PHONON_SETTINGSGROUP
  }
  
- QList<int> GlobalConfig::audioCaptureDeviceListFor(Phonon::Category category, int \
override) const + QList<int> GlobalConfig::audioCaptureDeviceListFor(CaptureCategory \
category, int override) const  {
      K_D(const GlobalConfig);
  
@@@ -467,11 -577,19 +548,11 @@@
          defaultList += list;
      }
  
 -#ifndef QT_NO_PHONON_SETTINGSGROUP
      const QSettingsGroup backendConfig(&d->config, \
                QLatin1String("AudioCaptureDevice")); // + Factory::identifier());
      return sortDevicesByCategoryPriority(this, &backendConfig, \
                AudioCaptureDeviceType, category, defaultList);
 -#else //QT_NO_PHONON_SETTINGSGROUP
 -#ifndef QT_NO_PHONON_PLATFORMPLUGIN
 -    return defaultList;
 -#else //QT_NO_PHONON_PLATFORMPLUGIN
 -    return QList<int>();
 -#endif //QT_NO_PHONON_PLATFORMPLUGIN
 -#endif //QT_NO_PHONON_SETTINGSGROUP
  }
  
- int GlobalConfig::audioCaptureDeviceFor(Phonon::Category category, int override) \
const + int GlobalConfig::audioCaptureDeviceFor(CaptureCategory category, int \
override) const  {
      QList<int> ret = audioCaptureDeviceListFor(category, override);
      if (ret.isEmpty())
@@@ -487,8 -624,9 +587,8 @@@ int GlobalConfig::audioCaptureDeviceFor
  
  
  #ifndef PHONON_NO_VIDEOCAPTURE
- void GlobalConfig::setVideoCaptureDeviceListFor(Category category, QList< int > \
order) + void GlobalConfig::setVideoCaptureDeviceListFor(CaptureCategory category, \
QList<int> order)  {
 -#ifndef QT_NO_PHONON_SETTINGSGROUP
      K_D(GlobalConfig);
      QSettingsGroup backendConfig(&d->config, QLatin1String("VideoCaptureDevice")); \
// + Factory::identifier());  
@@@ -500,25 -638,31 +600,25 @@@
      } else {
          backendConfig.setValue(QLatin1String("Category_") + \
QString::number(category), order);  }
 -#endif //QT_NO_PHONON_SETTINGSGROUP
  }
  
- QList<int> GlobalConfig::videoCaptureDeviceListFor(Phonon::Category category, int \
override) const + QList<int> GlobalConfig::videoCaptureDeviceListFor(CaptureCategory \
category, int override) const  {
      K_D(const GlobalConfig);
  
      const bool hide = ((override & AdvancedDevicesFromSettings)
          ? hideAdvancedDevices()
          : static_cast<bool>(override & HideAdvancedDevices));
 -#else
 -    const bool hide = !((override & AdvancedDevicesFromSettings) && \
                static_cast<bool>(override & HideAdvancedDevices));
 -#endif
  
      //First we lookup the available devices directly from the backend
-     BackendInterface *backendIface = qobject_cast<BackendInterface \
*>(Phonon::Factory::backend()); +     BackendInterface *backendIface = \
qobject_cast<BackendInterface *>(Factory::backend());  if (!backendIface) {
          return QList<int>();
      }
  
      // this list already is in default order (as defined by the backend)
-     QList<int> defaultList = \
backendIface->objectDescriptionIndexes(Phonon::VideoCaptureDeviceType); +     \
QList<int> defaultList = \
backendIface->objectDescriptionIndexes(VideoCaptureDeviceType);  
 -#ifndef QT_NO_PHONON_PLATFORMPLUGIN
      if (PlatformPlugin *platformPlugin = Factory::platformPlugin()) {
          // the platform plugin lists the video devices for the platform
          // this list already is in default order (as defined by the platform \
plugin) @@@ -545,9 -691,12 +645,9 @@@
      //The devices need to be stored independently for every backend
      const QSettingsGroup backendConfig(&d->config, \
                QLatin1String("VideoCaptureDevice")); // + Factory::identifier());
      return sortDevicesByCategoryPriority(this, &backendConfig, \
                VideoCaptureDeviceType, category, defaultList);
 -#else // QT_NO_PHONON_SETTINGSGROUP
 -    return defaultList;
 -#endif // QT_NO_PHONON_SETTINGSGROUP
  }
  
- int GlobalConfig::videoCaptureDeviceFor(Phonon::Category category, int override) \
const + int GlobalConfig::videoCaptureDeviceFor(CaptureCategory category, int \
override) const  {
      QList<int> ret = videoCaptureDeviceListFor(category, override);
      if (ret.isEmpty())


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