[ekiga] Fixed possible crash with SILENT fallback device.



commit 02374d65a0d59a815a7469cb13dce957a75a45ee
Author: Damien Sandras <dsandras seconix com>
Date:   Mon Oct 26 20:55:17 2009 +0100

    Fixed possible crash with SILENT fallback device.
    
    The fallback device should always be compiled in.
    However, we should allow choosing it directly in the settings only if Ekiga was
    compiled in DEBUG mode. Thanks to Michael Rickmann for the good bug report.

 lib/Makefile.am                                    |    2 --
 .../null-audioinput/audioinput-manager-null.cpp    |    2 ++
 .../null-audiooutput/audiooutput-manager-null.cpp  |    2 ++
 lib/engine/engine.cpp                              |    3 ---
 4 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0232a1a..254ae8f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -595,7 +595,6 @@ libekiga_la_SOURCES += \
 # Sources of the null audio input component
 ##
 
-if DEBUG
 libekiga_la_SOURCES += \
 	$(components_dir)/null-audioinput/audioinput-manager-null.h \
 	$(components_dir)/null-audioinput/audioinput-manager-null.cpp \
@@ -611,7 +610,6 @@ libekiga_la_SOURCES += \
 	$(components_dir)/null-audiooutput/audiooutput-manager-null.cpp \
 	$(components_dir)/null-audiooutput/audiooutput-main-null.h \
 	$(components_dir)/null-audiooutput/audiooutput-main-null.cpp
-endif
 
 ##
 # Sources of the hal dbus component
diff --git a/lib/engine/components/null-audioinput/audioinput-manager-null.cpp b/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
index d1709e0..4ef2662 100644
--- a/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
+++ b/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
@@ -51,11 +51,13 @@ GMAudioInputManager_null::~GMAudioInputManager_null ()
 
 void GMAudioInputManager_null::get_devices(std::vector <Ekiga::AudioInputDevice> & devices)
 {
+#if DEBUG
   Ekiga::AudioInputDevice device;
   device.type   = DEVICE_TYPE;
   device.source = DEVICE_SOURCE;
   device.name   = DEVICE_NAME;
   devices.push_back(device);
+#endif
 }
 
 bool GMAudioInputManager_null::set_device (const Ekiga::AudioInputDevice & device)
diff --git a/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp b/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
index 01bcc5e..3bf3a31 100644
--- a/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
+++ b/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
@@ -51,11 +51,13 @@ GMAudioOutputManager_null::~GMAudioOutputManager_null ()
 
 void GMAudioOutputManager_null::get_devices(std::vector <Ekiga::AudioOutputDevice> & devices)
 {
+#if DEBUG
   Ekiga::AudioOutputDevice device;
   device.type   = DEVICE_TYPE;
   device.source = DEVICE_SOURCE;
   device.name   = DEVICE_NAME;
   devices.push_back(device);
+#endif
 }
 
 
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index 7c14310..dc77f9f 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -177,15 +177,12 @@ engine_init (Ekiga::ServiceCorePtr service_core,
   libnotify_init (kickstart);
 #endif
 
-#if DEBUG
   audioinput_null_init (kickstart);
   audiooutput_null_init (kickstart);
-#endif
 
   videoinput_ptlib_init (kickstart);
 
   audioinput_ptlib_init (kickstart);
-
   audiooutput_ptlib_init (kickstart);
 
 #ifdef HAVE_DBUS



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]