mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

use macro to hash lookup

Browse source 
Original commit message from CVS:
use macro to hash lookup
This commit is contained in:
Thomas Vander Stichele 2004-07-08 14:38:48 +00:00
parent f73ed6d78e
commit 2391c9703d
2 changed files with 41 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2004-07-08 Thomas Vander Stichele <thomas (at) apestaart (dot) org>
* gst-libs/gst/play/play.c: (gst_play_set_location),
(gst_play_set_data_src), (gst_play_set_video_sink),
(gst_play_set_audio_sink), (gst_play_set_visualization),
(gst_play_connect_visualization), (gst_play_get_framerate):
use a macro to look up elements from hash table
2004-07-08 Thomas Vander Stichele <thomas (at) apestaart (dot) org> 2004-07-08 Thomas Vander Stichele <thomas (at) apestaart (dot) org>
* gst-libs/gst/play/play.c: (gst_play_pipeline_setup), * gst-libs/gst/play/play.c: (gst_play_pipeline_setup),

109
gst-libs/gst/play/play.c
View file

@ -131,6 +131,12 @@ G_STMT_START { \
return FALSE; \ return FALSE; \
} G_STMT_END } G_STMT_END
#define GST_PLAY_HASH_LOOKUP(element, key, retval_if_fail) \
G_STMT_START { \
(element) = g_hash_table_lookup (play->priv->elements, (key));\
if (!element) \
return (retval_if_fail); \
} G_STMT_END
/* setup parts of the pipeline /* setup parts of the pipeline
* only put decoding part in the thread * only put decoding part in the thread
@ -749,23 +755,13 @@ gst_play_set_location (GstPlay * play, const char *location)
return FALSE; return FALSE;
} }
work_thread = g_hash_table_lookup (play->priv->elements, "work_thread"); GST_PLAY_HASH_LOOKUP (work_thread, "work_thread", FALSE);
if (!GST_IS_ELEMENT (work_thread)) GST_PLAY_HASH_LOOKUP (source, "source", FALSE);
return FALSE; GST_PLAY_HASH_LOOKUP (autoplugger, "autoplugger", FALSE);
source = g_hash_table_lookup (play->priv->elements, "source"); GST_PLAY_HASH_LOOKUP (audioconvert, "audioconvert", FALSE);
if (!GST_IS_ELEMENT (source)) GST_PLAY_HASH_LOOKUP (identity, "identity", FALSE);
return FALSE;
autoplugger = g_hash_table_lookup (play->priv->elements, "autoplugger");
if (!GST_IS_ELEMENT (autoplugger))
return FALSE;
audioconvert = g_hash_table_lookup (play->priv->elements, "audioconvert");
if (!GST_IS_ELEMENT (audioconvert))
return FALSE;
identity = g_hash_table_lookup (play->priv->elements, "identity");
if (!GST_IS_ELEMENT (identity))
return FALSE;
/* Spider can autoplugg only once. We remove the actual one and put a new /* Spider can autoplug only once. We remove the actual one and put a new
autoplugger */ autoplugger */
gst_element_unlink (source, autoplugger); gst_element_unlink (source, autoplugger);
gst_element_unlink (autoplugger, identity); gst_element_unlink (autoplugger, identity);
@ -901,15 +897,9 @@ gst_play_set_data_src (GstPlay * play, GstElement * data_src)
} }
/* Getting needed objects */ /* Getting needed objects */
work_thread = g_hash_table_lookup (play->priv->elements, "work_thread"); GST_PLAY_HASH_LOOKUP (work_thread, "work_thread", FALSE);
if (!GST_IS_ELEMENT (work_thread)) GST_PLAY_HASH_LOOKUP (old_data_src, "source", FALSE);
return FALSE; GST_PLAY_HASH_LOOKUP (autoplugger, "autoplugger", FALSE);
old_data_src = g_hash_table_lookup (play->priv->elements, "source");
if (!GST_IS_ELEMENT (old_data_src))
return FALSE;
autoplugger = g_hash_table_lookup (play->priv->elements, "autoplugger");
if (!GST_IS_ELEMENT (autoplugger))
return FALSE;
/* Unlinking old source from autoplugger, removing it from pipeline, adding /* Unlinking old source from autoplugger, removing it from pipeline, adding
the new one and connecting it to autoplugger FIXME: we should put a new the new one and connecting it to autoplugger FIXME: we should put a new
@ -954,15 +944,9 @@ gst_play_set_video_sink (GstPlay * play, GstElement * video_sink)
} }
/* Getting needed objects */ /* Getting needed objects */
video_thread = g_hash_table_lookup (play->priv->elements, "video_thread"); GST_PLAY_HASH_LOOKUP (video_thread, "video_thread", FALSE);
if (!GST_IS_ELEMENT (video_thread)) GST_PLAY_HASH_LOOKUP (old_video_sink, "video_sink", FALSE);
return FALSE; GST_PLAY_HASH_LOOKUP (video_scaler, "video_scaler", FALSE);
old_video_sink = g_hash_table_lookup (play->priv->elements, "video_sink");
if (!GST_IS_ELEMENT (old_video_sink))
return FALSE;
video_scaler = g_hash_table_lookup (play->priv->elements, "video_scaler");
if (!GST_IS_ELEMENT (video_scaler))
return FALSE;
/* Unlinking old video sink from video scaler, removing it from pipeline, /* Unlinking old video sink from video scaler, removing it from pipeline,
adding the new one and linking it */ adding the new one and linking it */
@ -1021,15 +1005,9 @@ gst_play_set_audio_sink (GstPlay * play, GstElement * audio_sink)
} }
/* Getting needed objects */ /* Getting needed objects */
old_audio_sink = g_hash_table_lookup (play->priv->elements, "audio_sink"); GST_PLAY_HASH_LOOKUP (audio_thread, "audio_thread", FALSE);
if (!GST_IS_ELEMENT (old_audio_sink)) GST_PLAY_HASH_LOOKUP (volume, "volume", FALSE);
return FALSE; GST_PLAY_HASH_LOOKUP (old_audio_sink, "audio_sink", FALSE);
audio_thread = g_hash_table_lookup (play->priv->elements, "audio_thread");
if (!GST_IS_ELEMENT (audio_thread))
return FALSE;
volume = g_hash_table_lookup (play->priv->elements, "volume");
if (!GST_IS_ELEMENT (volume))
return FALSE;
/* Unlinking old audiosink, removing it from pipeline, putting the new one /* Unlinking old audiosink, removing it from pipeline, putting the new one
and linking it */ and linking it */
@ -1075,18 +1053,10 @@ gst_play_set_visualization (GstPlay * play, GstElement * vis_element)
g_return_val_if_fail (GST_IS_ELEMENT (vis_element), FALSE); g_return_val_if_fail (GST_IS_ELEMENT (vis_element), FALSE);
/* Getting needed objects */ /* Getting needed objects */
vis_bin = g_hash_table_lookup (play->priv->elements, "vis_bin"); GST_PLAY_HASH_LOOKUP (vis_bin, "vis_bin", FALSE);
if (!GST_IS_ELEMENT (vis_bin)) GST_PLAY_HASH_LOOKUP (vis_queue, "vis_queue", FALSE);
return FALSE; GST_PLAY_HASH_LOOKUP (old_vis_element, "vis_element", FALSE);
vis_queue = g_hash_table_lookup (play->priv->elements, "vis_queue"); GST_PLAY_HASH_LOOKUP (vis_cs, "vis_cs", FALSE);
if (!GST_IS_ELEMENT (vis_queue))
return FALSE;
old_vis_element = g_hash_table_lookup (play->priv->elements, "vis_element");
if (!GST_IS_ELEMENT (old_vis_element))
return FALSE;
vis_cs = g_hash_table_lookup (play->priv->elements, "vis_cs");
if (!GST_IS_ELEMENT (vis_cs))
return FALSE;
/* We bring back the pipeline to PAUSED */ /* We bring back the pipeline to PAUSED */
if (GST_STATE (GST_ELEMENT (play)) == GST_STATE_PLAYING) { if (GST_STATE (GST_ELEMENT (play)) == GST_STATE_PLAYING) {
@ -1140,24 +1110,13 @@ gst_play_connect_visualization (GstPlay * play, gboolean connect)
return TRUE; return TRUE;
/* Getting needed objects */ /* Getting needed objects */
video_thread = g_hash_table_lookup (play->priv->elements, "video_thread"); GST_PLAY_HASH_LOOKUP (video_thread, "video_thread", FALSE);
if (!GST_IS_ELEMENT (video_thread)) GST_PLAY_HASH_LOOKUP (vis_bin, "vis_bin", FALSE);
return FALSE; GST_PLAY_HASH_LOOKUP (vis_queue, "vis_queue", FALSE);
vis_bin = g_hash_table_lookup (play->priv->elements, "vis_bin"); GST_PLAY_HASH_LOOKUP (video_switch, "video_switch", FALSE);
if (!GST_IS_ELEMENT (vis_bin)) GST_PLAY_HASH_LOOKUP (identity, "identity", FALSE);
return FALSE;
vis_queue = g_hash_table_lookup (play->priv->elements, "vis_queue"); GST_PLAY_HASH_LOOKUP (tee_pad1, "tee_pad1", FALSE);
if (!GST_IS_ELEMENT (vis_queue))
return FALSE;
video_switch = g_hash_table_lookup (play->priv->elements, "video_switch");
if (!GST_IS_ELEMENT (video_switch))
return FALSE;
identity = g_hash_table_lookup (play->priv->elements, "identity");
if (!GST_IS_ELEMENT (identity))
return FALSE;
tee_pad1 = g_hash_table_lookup (play->priv->elements, "tee_pad1");
if (!GST_IS_PAD (tee_pad1))
return FALSE;
vis_queue_pad = gst_element_get_pad (vis_queue, "sink"); vis_queue_pad = gst_element_get_pad (vis_queue, "sink");
@ -1246,9 +1205,7 @@ gst_play_get_framerate (GstPlay * play)
g_return_val_if_fail (GST_IS_PLAY (play), 0); g_return_val_if_fail (GST_IS_PLAY (play), 0);
video_element = g_hash_table_lookup (play->priv->elements, "video_sink"); GST_PLAY_HASH_LOOKUP (video_element, "video_sink", 0);
if (!GST_IS_ELEMENT (video_element))
return 0;
video_pad = gst_element_get_pad (video_element, "sink"); video_pad = gst_element_get_pad (video_element, "sink");
if (!GST_IS_PAD (video_pad)) if (!GST_IS_PAD (video_pad))
return 0; return 0;