ekiga r6204 - in trunk: . lib/engine/audioinput/skel lib/engine/audiooutput/skel lib/engine/vidinput/skel
- From: mschneid svn gnome org
- To: svn-commits-list gnome org
- Subject: ekiga r6204 - in trunk: . lib/engine/audioinput/skel lib/engine/audiooutput/skel lib/engine/vidinput/skel
- Date: Thu, 17 Apr 2008 07:06:32 +0100 (BST)
Author: mschneid
Date: Thu Apr 17 07:06:32 2008
New Revision: 6204
URL: http://svn.gnome.org/viewvc/ekiga?rev=6204&view=rev
Log:
Fall-forward when device is being closed in order to
try again next time the device is opened.
Modified:
trunk/ChangeLog
trunk/lib/engine/audioinput/skel/audioinput-core.cpp
trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp
trunk/lib/engine/vidinput/skel/vidinput-core.cpp
Modified: trunk/lib/engine/audioinput/skel/audioinput-core.cpp
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-core.cpp (original)
+++ trunk/lib/engine/audioinput/skel/audioinput-core.cpp Thu Apr 17 07:06:32 2008
@@ -251,7 +251,7 @@
// preview_manager.stop();
internal_close();
-
+ internal_set_device(desired_device);
preview_config.active = false;
}
@@ -301,6 +301,7 @@
}
internal_close();
+ internal_set_device(desired_device);
stream_config.active = false;
average_level = 0;
Modified: trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp (original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp Thu Apr 17 07:06:32 2008
@@ -211,6 +211,8 @@
average_level = 0;
internal_close(primary);
+ internal_set_device(primary, desired_primary_device);
+
current_primary_config.active = false;
}
Modified: trunk/lib/engine/vidinput/skel/vidinput-core.cpp
==============================================================================
--- trunk/lib/engine/vidinput/skel/vidinput-core.cpp (original)
+++ trunk/lib/engine/vidinput/skel/vidinput-core.cpp Thu Apr 17 07:06:32 2008
@@ -264,6 +264,7 @@
if (preview_config.active && !stream_config.active) {
preview_manager.stop();
internal_close();
+ internal_set_device(desired_device, current_channel, current_format);
}
preview_config.active = false;
@@ -320,6 +321,7 @@
preview_config.fps != stream_config.fps )
{
internal_close();
+ internal_set_device(desired_device, current_channel, current_format);
internal_open(preview_config.width, preview_config.height, preview_config.fps);
}
preview_manager.start(preview_config.width, preview_config.height);
@@ -327,6 +329,7 @@
if (!preview_config.active && stream_config.active) {
internal_close();
+ internal_set_device(desired_device, current_channel, current_format);
}
stream_config.active = false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]