← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/conf/dlgaudio.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/conf/dlgaudio.cpp
26
26
#include <KLineEdit>
27
27
 
28
28
//SFLPhone
29
 
#include "lib/dbus/configurationmanager.h"
30
29
#include "klib/kcfg_settings.h"
31
30
#include "conf/configurationdialog.h"
32
31
#include "lib/sflphone_const.h"
38
37
{
39
38
   setupUi(this);
40
39
 
41
 
   ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
42
 
   m_pAlwaysRecordCK->setChecked(configurationManager.getIsAlwaysRecording());
 
40
   m_pAlwaysRecordCK->setChecked(AudioSettingsModel::instance()->isAlwaysRecording());
43
41
 
44
42
   KUrlRequester_destinationFolder->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly);
45
 
   KUrlRequester_destinationFolder->setUrl(KUrl(configurationManager.getRecordPath()));
 
43
   KUrlRequester_destinationFolder->setUrl(KUrl(AudioSettingsModel::instance()->recordPath()));
46
44
   KUrlRequester_destinationFolder->lineEdit()->setReadOnly(true);
47
45
 
48
46
   m_pSuppressNoise->setChecked(AudioSettingsModel::instance()->isNoiseSuppressEnabled());
55
53
   box_alsaPlugin->setModel    (AudioSettingsModel::instance()->alsaPluginModel  () );
56
54
   loadAlsaSettings();
57
55
 
58
 
   m_pManager->setCurrentIndex (AudioSettingsModel::instance()->audioManagerModel()->currentManager().row());
 
56
   m_pManager->setCurrentIndex (AudioSettingsModel::instance()->audioManagerModel()->currentManagerIndex().row());
59
57
 
60
58
   connect( box_alsaPlugin   , SIGNAL(activated(int)) , parent, SLOT(updateButtons()));
61
59
   connect( this             , SIGNAL(updateButtons()), parent, SLOT(updateButtons()));
71
69
   connect( KUrlRequester_destinationFolder , SIGNAL(textChanged(QString))     , SLOT(changed()));
72
70
   connect( m_pManager                      , SIGNAL(currentIndexChanged(int)) , 
73
71
            AudioSettingsModel::instance()->audioManagerModel(),SLOT(setCurrentManager(int)));
 
72
   connect(AudioSettingsModel::instance()->audioManagerModel(),SIGNAL(currentManagerChanged(int)),m_pManager,
 
73
           SLOT(setCurrentIndex(int)));
74
74
   connect( m_pManager                      , SIGNAL(currentIndexChanged(int)) , SLOT(loadAlsaSettings()));
75
75
}
76
76
 
91
91
   if (m_Changed) {
92
92
      m_IsLoading = true;
93
93
 
94
 
      ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
95
 
      configurationManager.setRecordPath(KUrlRequester_destinationFolder->lineEdit()->text());
96
 
//       configurationManager.setAudioPlugin(box_alsaPlugin->currentText());
97
 
 
98
 
      configurationManager.setIsAlwaysRecording   ( m_pAlwaysRecordCK->isChecked()          );
 
94
      AudioSettingsModel::instance()->setRecordPath(KUrlRequester_destinationFolder->lineEdit()->text());
 
95
      AudioSettingsModel::instance()->setAlwaysRecording(m_pAlwaysRecordCK->isChecked());
99
96
 
100
97
      AudioSettingsModel::instance()->inputDeviceModel   ()->setCurrentDevice(alsaInputDevice->currentIndex   ());
101
98
      AudioSettingsModel::instance()->outputDeviceModel  ()->setCurrentDevice(alsaOutputDevice->currentIndex  ());
118
115
///Tag the dialog as needing saving
119
116
void DlgAudio::changed()
120
117
{
121
 
   box_alsaPlugin->setDisabled(m_pManager->currentIndex());
 
118
   switch (AudioSettingsModel::instance()->audioManagerModel()->currentManager()) {
 
119
      case AudioManagerModel::Manager::PULSE:
 
120
         box_alsaPlugin->setDisabled(true);
 
121
         stackedWidget_interfaceSpecificSettings->setVisible(true);
 
122
         break;
 
123
      case AudioManagerModel::Manager::ALSA:
 
124
         box_alsaPlugin->setDisabled(false);
 
125
         stackedWidget_interfaceSpecificSettings->setVisible(true);
 
126
         break;
 
127
      case AudioManagerModel::Manager::JACK:
 
128
         box_alsaPlugin->setDisabled(true);
 
129
         stackedWidget_interfaceSpecificSettings->setVisible(false);
 
130
         break;
 
131
   };
122
132
   if (!m_IsLoading) {
123
133
      m_Changed = true;
124
134
      emit updateButtons();