summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/modules/gstreamer
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2009-05-15 11:48:32 +0000
committerCarsten Haitzler <raster@rasterman.com>2009-05-15 11:48:32 +0000
commit67db885317ec0335bb0facfd738a48fe25315a0d (patch)
treedc7086a7eed75d8768d45d070b2a187305aba4db /legacy/emotion/src/modules/gstreamer
parent1d75ac114aff9dd70b4da63203c237cb6bd00be2 (diff)
gstreamer fixes
SVN revision: 40671
Diffstat (limited to 'legacy/emotion/src/modules/gstreamer')
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c9
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_cdda.c2
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c5
3 files changed, 8 insertions, 8 deletions
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
index e8f5bbf9d7..4d3632aafd 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
@@ -97,7 +97,7 @@ file_new_decoded_pad_cb(GstElement *decodebin,
97 vsink = (Emotion_Video_Sink *)calloc(1, sizeof(Emotion_Video_Sink)); 97 vsink = (Emotion_Video_Sink *)calloc(1, sizeof(Emotion_Video_Sink));
98 if (!vsink) return; 98 if (!vsink) return;
99 ev->video_sinks = eina_list_append(ev->video_sinks, vsink); 99 ev->video_sinks = eina_list_append(ev->video_sinks, vsink);
100 if (!eina_list_data_find(ev->video_sinks, vsink)) 100 if (eina_error_get())
101 { 101 {
102 free(vsink); 102 free(vsink);
103 return; 103 return;
@@ -126,14 +126,13 @@ file_new_decoded_pad_cb(GstElement *decodebin,
126 asink = (Emotion_Audio_Sink *)calloc(1, sizeof(Emotion_Audio_Sink)); 126 asink = (Emotion_Audio_Sink *)calloc(1, sizeof(Emotion_Audio_Sink));
127 if (!asink) return; 127 if (!asink) return;
128 ev->audio_sinks = eina_list_append(ev->audio_sinks, asink); 128 ev->audio_sinks = eina_list_append(ev->audio_sinks, asink);
129 if (!eina_list_data_find(ev->audio_sinks, asink)) 129 if (eina_error_get())
130 { 130 {
131 free(asink); 131 free(asink);
132 return; 132 return;
133 } 133 }
134 134
135 for (index = 0; asink != eina_list_nth(ev->audio_sinks, index); index++) 135 index = eina_list_count(ev->audio_sinks);
136 ;
137 asink->sink = emotion_audio_sink_create(ev, index); 136 asink->sink = emotion_audio_sink_create(ev, index);
138 gst_bin_add(GST_BIN(ev->pipeline), asink->sink); 137 gst_bin_add(GST_BIN(ev->pipeline), asink->sink);
139 audiopad = gst_element_get_pad(asink->sink, "sink"); 138 audiopad = gst_element_get_pad(asink->sink, "sink");
@@ -155,7 +154,7 @@ emotion_video_sink_new(Emotion_Gstreamer_Video *ev)
155 if (!vsink) return NULL; 154 if (!vsink) return NULL;
156 155
157 ev->video_sinks = eina_list_append(ev->video_sinks, vsink); 156 ev->video_sinks = eina_list_append(ev->video_sinks, vsink);
158 if (!eina_list_data_find(ev->video_sinks, vsink)) 157 if (eina_error_get())
159 { 158 {
160 free(vsink); 159 free(vsink);
161 return NULL; 160 return NULL;
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_cdda.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_cdda.c
index 655252a1a2..b2f47366b2 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_cdda.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_cdda.c
@@ -108,7 +108,7 @@ _emotion_audio_sink_new(Emotion_Gstreamer_Video *ev)
108 if (!asink) return NULL; 108 if (!asink) return NULL;
109 109
110 ev->audio_sinks = eina_list_append(ev->audio_sinks, asink); 110 ev->audio_sinks = eina_list_append(ev->audio_sinks, asink);
111 if (!eina_list_data_find(ev->audio_sinks, asink)) 111 if (eina_error_get())
112 { 112 {
113 free(asink); 113 free(asink);
114 return NULL; 114 return NULL;
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
index ea8a6f26f1..48b9f00dde 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
@@ -101,6 +101,7 @@ emotion_pipeline_dvd_build(void *video, const char *device)
101 GstCaps *sink_caps; 101 GstCaps *sink_caps;
102 102
103 asink = (Emotion_Audio_Sink *)eina_list_data_get(alist); 103 asink = (Emotion_Audio_Sink *)eina_list_data_get(alist);
104 alist = eina_list_next(alist);
104 sink_pad = gst_element_get_pad(gst_bin_get_by_name(GST_BIN(ev->pipeline), "a52dec"), "src"); 105 sink_pad = gst_element_get_pad(gst_bin_get_by_name(GST_BIN(ev->pipeline), "a52dec"), "src");
105 sink_caps = gst_pad_get_caps(sink_pad); 106 sink_caps = gst_pad_get_caps(sink_pad);
106 107
@@ -165,7 +166,7 @@ dvd_pad_added_cb(GstElement *dvddemuxer,
165 vsink = (Emotion_Video_Sink *)malloc(sizeof(Emotion_Video_Sink)); 166 vsink = (Emotion_Video_Sink *)malloc(sizeof(Emotion_Video_Sink));
166 if (!vsink) return; 167 if (!vsink) return;
167 ev->video_sinks = eina_list_append(ev->video_sinks, vsink); 168 ev->video_sinks = eina_list_append(ev->video_sinks, vsink);
168 if (!eina_list_data_find(ev->video_sinks, vsink)) 169 if (eina_error_get())
169 { 170 {
170 free(vsink); 171 free(vsink);
171 return; 172 return;
@@ -203,7 +204,7 @@ dvd_pad_added_cb(GstElement *dvddemuxer,
203 asink = (Emotion_Audio_Sink *)malloc(sizeof(Emotion_Audio_Sink)); 204 asink = (Emotion_Audio_Sink *)malloc(sizeof(Emotion_Audio_Sink));
204 if (!asink) return; 205 if (!asink) return;
205 ev->audio_sinks = eina_list_append(ev->audio_sinks, asink); 206 ev->audio_sinks = eina_list_append(ev->audio_sinks, asink);
206 if (!eina_list_data_find(ev->audio_sinks, asink)) 207 if (eina_error_get())
207 { 208 {
208 free(asink); 209 free(asink);
209 return; 210 return;