Changeset 251:5de6dc8df85c in qutecom-coip

Timestamp:

Apr 13, 2010 11:02:15 PM (3 years ago)

Author:

laurent

Branch:

default

Message:

nug fix : ConfigManager?

Files:

• gui/src/coip/coip.cpp (modified) (1 diff)
• gui/src/config/config.cpp (modified) (1 diff)
• gui/src/manager/manager.cpp (modified) (1 diff)
• gui/src/wizard/audiopage.cpp (modified) (2 diffs)
• libs/coipmanager/include/coipmanager/CoIpManager.h (modified) (2 diffs)
• libs/coipmanager/src/CoIpManager.cpp (modified) (4 diffs)
• libs/coipmanager/src/mediamanager/MediaManager.cpp (modified) (3 diffs)
• libs/coipmanager_threaded/include/coipmanager_threaded/TCoIpManager.h (modified) (2 diffs)
• libs/coipmanager_threaded/src/TCoIpManager.cpp (modified) (2 diffs)

gui/src/coip/coip.cpp

@@ -5 +5 @@
 
 Coip::Coip(QObject * parent)
-:TCoIpManager(*Config::self())
+:TCoIpManager(Config::self())
 {
         connect(this ,SIGNAL(initialized()),this,SLOT(coipInitializedSlot()));

gui/src/config/config.cpp

@@ -50 +50 @@
 #endif
     set(CONFIG_PATH_KEY, Path::getConfigurationDirPath() + endOfPath);
+        
 
     if (!File::exists(File::convertPathSeparators(getConfigPath())))

gui/src/manager/manager.cpp

@@ -22 +22 @@
         delete Systray::self();
         delete Coip::self();
-        delete Config::self();
 }
 

gui/src/wizard/audiopage.cpp

@@ -25 +25 @@
         }
         
-        /*ui->comboBoxInput->setCurrentIndex(ui->comboBoxInput->findText(input));
-        ui->comboBoxOutput->setCurrentIndex(ui->comboBoxOutput->findText(output));
-        ui->comboBoxRinging->setCurrentIndex(ui->comboBoxRinging->findText(ringer));*/
+        int index = ui->comboBoxInput->findData(Coip::self()->getTMediaManager().getAudioInputId());
+        if(index > -1)
+                ui->comboBoxInput->setCurrentIndex(index);
+        
+        index = ui->comboBoxOutput->findData(Coip::self()->getTMediaManager().getAudioOutputId());
+        if(index > -1)
+                ui->comboBoxOutput->setCurrentIndex(index);
+        
+        index = ui->comboBoxRinging->findData(Coip::self()->getTMediaManager().getAudioRingerId());
+        if(index > -1)
+                ui->comboBoxRinging->setCurrentIndex(index);
+                
 }
 
@@ -64 +73 @@
                 Coip::self()->getTMediaManager().setAudioRingerId(data.toInt());
         }
-        
-        /*Config::self()->set(CoIpManagerConfig::AUDIO_INPUT_ID_KEY,_mapInput.value(ui->comboBoxInput->itemData(ui->comboBoxInput->currentIndex()).toString()).getData());
-        Config::self()->set(CoIpManagerConfig::AUDIO_OUTPUT_ID_KEY,_mapOutput.value(ui->comboBoxOutput->itemData(ui->comboBoxOutput->currentIndex()).toString()).getData());
-        Config::self()->set(CoIpManagerConfig::AUDIO_RINGER_ID_KEY,_mapOutput.value(ui->comboBoxRinging->itemData(ui->comboBoxRinging->currentIndex()).toString()).getData());*/
-        
-        //Config::self()->save();
+
+        Config::self()->save();
         
         return true;

libs/coipmanager/include/coipmanager/CoIpManager.h

@@ -115 +115 @@
          * @param coIpManagerConfig config of CoIpManager. Copied internally.
          */
-        COIPMANAGER_API CoIpManager(const CoIpManagerConfig & coIpManagerConfig);
+        COIPMANAGER_API CoIpManager(CoIpManagerConfig * coIpManagerConfig);
 
         COIPMANAGER_API ~CoIpManager();
@@ -195 +195 @@
         MediaManager * _mediaManager;
 
-        CoIpManagerConfig _coIpManagerConfig;
+        CoIpManagerConfig * _coIpManagerConfig;
 
         CoIpManagerSaver * _coIpManagerSaver;

libs/coipmanager/src/CoIpManager.cpp

@@ -88 +88 @@
 }
 
-CoIpManager::CoIpManager(const CoIpManagerConfig & coIpManagerConfig) {
+CoIpManager::CoIpManager(CoIpManagerConfig * coIpManagerConfig) {
         _coIpManagerConfig = coIpManagerConfig;
         _userProfileManager = NULL;
@@ -128 +128 @@
         
         OWSAFE_DELETE(_mediaManager);
+        
+        OWSAFE_DELETE(_coIpManagerConfig);
 
         for (std::vector<ICoIpManagerInitPlugin *>::iterator it = _coIpManagerInitPluginVector.begin();
@@ -159 +161 @@
 
 CoIpManagerConfig & CoIpManager::getCoIpManagerConfig() {
-        return _coIpManagerConfig;
+        return *_coIpManagerConfig;
 }
 
@@ -197 +199 @@
 
         std::list<void *> pluginList =
-                CoIpManagerPluginLoader::loadPlugins(_coIpManagerConfig.getCoIpPluginsPath(),
+                CoIpManagerPluginLoader::loadPlugins(_coIpManagerConfig->getCoIpPluginsPath(),
                         INITPLUGIN_PLUGIN_DIR, INIT_PLUGIN_NAME);
 

libs/coipmanager/src/mediamanager/MediaManager.cpp

@@ -136 +136 @@
 {
         _coIpManager.getCoIpManagerConfig().set(CoIpManagerConfig::AUDIO_OUTPUT_ID_KEY,id);
-        //_coIpManager.getCoIpManagerConfig().save();
         
         for (ICoIpManagerPluginList::const_iterator icmIt = _iCoIpManagerPluginList.begin();
@@ -152 +151 @@
 {
         _coIpManager.getCoIpManagerConfig().set(CoIpManagerConfig::AUDIO_INPUT_ID_KEY,id);
-        //_coIpManager.getCoIpManagerConfig().save();
         
         for (ICoIpManagerPluginList::const_iterator icmIt = _iCoIpManagerPluginList.begin();
@@ -168 +166 @@
 {
         _coIpManager.getCoIpManagerConfig().set(CoIpManagerConfig::AUDIO_RINGER_ID_KEY,id);
-        //_coIpManager.getCoIpManagerConfig().save();
         
         for (ICoIpManagerPluginList::const_iterator icmIt = _iCoIpManagerPluginList.begin();

libs/coipmanager_threaded/include/coipmanager_threaded/TCoIpManager.h

@@ -87 +87 @@
          * @param coIpManagerConfig config of CoIpManager, copied internally
          */
-        TCoIpManager(const CoIpManagerConfig & coIpManagerConfig);
+        TCoIpManager(CoIpManagerConfig * coIpManagerConfig);
 
         virtual ~TCoIpManager();
@@ -156 +156 @@
 
         /** Configuration passed to CoIpManager. */
-        CoIpManagerConfig _coIpManagerConfig;
+        CoIpManagerConfig * _coIpManagerConfig;
 
         CoIpManager * _coIpManager;

libs/coipmanager_threaded/src/TCoIpManager.cpp

@@ -33 +33 @@
 #include <util/Logger.h>
 
-TCoIpManager::TCoIpManager(const CoIpManagerConfig & coIpManagerConfig)
+TCoIpManager::TCoIpManager(CoIpManagerConfig * coIpManagerConfig)
         : _coIpManagerConfig(coIpManagerConfig) {
 
@@ -96 +96 @@
 
 CoIpManagerConfig & TCoIpManager::getCoIpManagerConfig() {
-        return _coIpManagerConfig;
+        return *_coIpManagerConfig;
 }