diff options
| author | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-10-11 20:40:44 +0000 |
|---|---|---|
| committer | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-10-11 20:40:44 +0000 |
| commit | 572197c1fb12774cd8c3004566d23b9fb859b77b (patch) | |
| tree | ee9053f24b41b675c3e791d8662fdd65b029b16a | |
| parent | 7f3724e07d0aaf148e8b94f44330eb26ba6704b2 (diff) | |
TpStreamEngine: if MAEMO_OSSO_SUPPORT is enabled, look for "gconfv4l2src" in favour of "v4l2src"
| -rw-r--r-- | src/tp-stream-engine.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/tp-stream-engine.c b/src/tp-stream-engine.c index dac8ba7..7163cdf 100644 --- a/src/tp-stream-engine.c +++ b/src/tp-stream-engine.c @@ -656,7 +656,7 @@ GstElement * tp_stream_engine_get_pipeline (TpStreamEngine *obj) { TpStreamEnginePrivate *priv = TP_STREAM_ENGINE_GET_PRIVATE (obj); - GstElement *videosrc; + GstElement *videosrc = NULL; GstElement *tee; GstBus *bus; GstCaps *filter; @@ -678,8 +678,13 @@ tp_stream_engine_get_pipeline (TpStreamEngine *obj) } else { - videosrc = gst_element_factory_make ("v4l2src", NULL); +#ifdef MAEMO_OSSO_SUPPORT + videosrc = gst_element_factory_make ("gconfv4l2src", NULL); +#endif + if (videosrc == NULL) + videosrc = gst_element_factory_make ("v4l2src", NULL); } + filter = gst_caps_new_simple( "video/x-raw-yuv", "width", G_TYPE_INT, 352, |