[ekiga/ds-gsettings3] VideoInputCore: Optimized fallback selection.

[Damien Sandras <dsandras src gnome org>]

commit c5db326fa0bddf2e28af2e994d8192b9f4ab62b2
Author: Damien Sandras <dsandras beip be>
Date:   Sat Nov 30 14:16:25 2013 +0100

    VideoInputCore: Optimized fallback selection.

 lib/engine/audioinput/audioinput-core.cpp |    1 +
 lib/engine/videoinput/videoinput-core.cpp |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/lib/engine/audioinput/audioinput-core.cpp b/lib/engine/audioinput/audioinput-core.cpp
index 692f2bc..c797bba 100644
--- a/lib/engine/audioinput/audioinput-core.cpp
+++ b/lib/engine/audioinput/audioinput-core.cpp
@@ -185,6 +185,7 @@ AudioInputCore::set_device (const std::string& device_string)
     device.SetFromString (device_string);
   else if (!devices.empty ())
     device.SetFromString (devices.begin ()->GetString ());
+  std::cout << "FIXME: We should probably fallback to a sane default like Pulseaudio" << std::endl << 
std::flush;
 
   if (device.type == ""
       || device.source == ""
diff --git a/lib/engine/videoinput/videoinput-core.cpp b/lib/engine/videoinput/videoinput-core.cpp
index 3af1c7c..5d1f45c 100644
--- a/lib/engine/videoinput/videoinput-core.cpp
+++ b/lib/engine/videoinput/videoinput-core.cpp
@@ -331,8 +331,8 @@ void VideoInputCore::set_device(const VideoInputDevice & _device, int channel, V
 
   if (!found)
     g_settings_set_string (settings, "input-device", device.GetString ().c_str ());
-
-  internal_set_device (device, channel, format);
+  else
+    internal_set_device (device, channel, format);
 }
 
 void VideoInputCore::add_device (const std::string & source, const std::string & device_name, unsigned 
capabilities, HalManager* /*manager*/)