13435
|
1 |
--- ./src/cheese-webcam.c.orig 2008-09-01 11:16:01.916287000 +0800
|
|
2 |
+++ ./src/cheese-webcam.c 2008-09-01 11:17:05.996507000 +0800
|
|
3 |
@@ -620,8 +620,13 @@
|
|
4 |
}
|
|
5 |
}
|
|
6 |
|
|
7 |
+#ifdef SOLARIS
|
|
8 |
+ *numerator = 15;
|
|
9 |
+ *denominator = 2;
|
|
10 |
+#else
|
|
11 |
*numerator = framerate_numerator;
|
|
12 |
*denominator = framerate_denominator;
|
|
13 |
+#endif
|
|
14 |
}
|
|
15 |
|
|
16 |
static gboolean
|
|
17 |
@@ -956,7 +961,7 @@
|
|
18 |
return FALSE;
|
|
19 |
|
|
20 |
gst_bin_add_many (GST_BIN (priv->video_save_bin), priv->audio_source, audio_queue,
|
|
21 |
- audio_convert, audio_enc, video_save_csp, video_save_rate, video_save_scale, video_enc,
|
|
22 |
+ audio_convert, audio_enc, video_save_csp, video_save_scale, video_enc,
|
|
23 |
mux, priv->video_file_sink, NULL);
|
|
24 |
|
|
25 |
/* add ghostpad */
|
|
26 |
@@ -968,7 +973,7 @@
|
|
27 |
ok = gst_element_link_many (priv->audio_source, audio_queue, audio_convert,
|
|
28 |
audio_enc, mux, priv->video_file_sink, NULL);
|
|
29 |
|
|
30 |
- ok &= gst_element_link_many (video_save_csp, video_save_rate, video_save_scale, video_enc,
|
|
31 |
+ ok &= gst_element_link_many (video_save_csp, video_save_scale, video_enc,
|
|
32 |
NULL);
|
|
33 |
ok &= gst_element_link (video_enc, mux);
|
|
34 |
|
|
35 |
--- ./src/cheese-gconf.c.orig 2008-08-19 02:32:53.000000000 +0800
|
|
36 |
+++ ./src/cheese-gconf.c 2008-09-01 11:17:05.997071000 +0800
|
|
37 |
@@ -103,14 +103,18 @@
|
|
38 |
g_slist_free (tmp);
|
|
39 |
break;
|
|
40 |
case GCONF_PROP_X_RESOLUTION:
|
|
41 |
+ gdk_threads_enter();
|
|
42 |
g_value_set_int (value, gconf_client_get_int (priv->client,
|
|
43 |
CHEESE_GCONF_PREFIX "/x_resolution",
|
|
44 |
NULL));
|
|
45 |
+ gdk_threads_leave();
|
|
46 |
break;
|
|
47 |
case GCONF_PROP_Y_RESOLUTION:
|
|
48 |
+ gdk_threads_enter();
|
|
49 |
g_value_set_int (value, gconf_client_get_int (priv->client,
|
|
50 |
CHEESE_GCONF_PREFIX "/y_resolution",
|
|
51 |
NULL));
|
|
52 |
+ gdk_threads_leave();
|
|
53 |
break;
|
|
54 |
case GCONF_PROP_VIDEO_PATH:
|
|
55 |
g_value_set_string (value, gconf_client_get_string (priv->client,
|