ekiga r6101 - in trunk: . lib/engine/vidinput/skel
- From: mschneid svn gnome org
- To: svn-commits-list gnome org
- Subject: ekiga r6101 - in trunk: . lib/engine/vidinput/skel
- Date: Mon, 31 Mar 2008 19:00:48 +0100 (BST)
Author: mschneid
Date: Mon Mar 31 19:00:48 2008
New Revision: 6101
URL: http://svn.gnome.org/viewvc/ekiga?rev=6101&view=rev
Log:
Add range check to some critical gconf variables.
Modified:
trunk/ChangeLog
trunk/lib/engine/vidinput/skel/vidinput-gmconf-bridge.cpp
Modified: trunk/lib/engine/vidinput/skel/vidinput-gmconf-bridge.cpp
==============================================================================
--- trunk/lib/engine/vidinput/skel/vidinput-gmconf-bridge.cpp (original)
+++ trunk/lib/engine/vidinput/skel/vidinput-gmconf-bridge.cpp Mon Mar 31 19:00:48 2008
@@ -69,6 +69,19 @@
(key == VIDEO_DEVICES_KEY "max_frame_rate") ) {
PTRACE(4, "VidInputCoreConfBridge\tUpdating preview size and fps");
+
+ if ( (gm_conf_get_int (VIDEO_DEVICES_KEY "size") < 0 ) ||
+ (gm_conf_get_int (VIDEO_DEVICES_KEY "size") >= NB_VIDEO_SIZES )) {
+ PTRACE(1, "VidInputCoreConfBridge\t" << VIDEO_DEVICES_KEY "size" << " out of range, ajusting to 0");
+ gm_conf_set_int (VIDEO_DEVICES_KEY "size", 0);
+ }
+
+ if ( (gm_conf_get_int (VIDEO_DEVICES_KEY "max_frame_rate") < 0 ) ||
+ (gm_conf_get_int (VIDEO_DEVICES_KEY "max_frame_rate") > 30)) {
+ PTRACE(1, "VidInputCoreConfBridge\t" << VIDEO_DEVICES_KEY "max_frame_rate" << " out of range, ajusting to 30");
+ gm_conf_set_int (VIDEO_DEVICES_KEY "max_frame_rate", 30);
+ }
+
vidinput_core.set_preview_config (VideoSizes[gm_conf_get_int (VIDEO_DEVICES_KEY "size")].width,
VideoSizes[gm_conf_get_int (VIDEO_DEVICES_KEY "size")].height,
gm_conf_get_int (VIDEO_CODECS_KEY "max_frame_rate"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]