From 4ecbe7733bef68743d196766146a5189c51ad977 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 21 Jan 2018 13:52:58 +0100 Subject: [PATCH] libarmbox/playback_gst.cpp: minor format changes --- libarmbox/playback_gst.cpp | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/libarmbox/playback_gst.cpp b/libarmbox/playback_gst.cpp index 7cb5b8f..4d380be 100644 --- a/libarmbox/playback_gst.cpp +++ b/libarmbox/playback_gst.cpp @@ -354,8 +354,6 @@ GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data) gst_object_unref(GST_OBJECT(videoSink)); videoSink = NULL; } - - // set audio sink children = gst_bin_iterate_recurse(GST_BIN(m_gst_playbin)); if (children && gst_iterator_find_custom(children, (GCompareFunc)match_sinktype, &r, (gpointer)"GstDVBAudioSink")) { @@ -365,8 +363,6 @@ GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data) } gst_iterator_free(children); - - // set video sink children = gst_bin_iterate_recurse(GST_BIN(m_gst_playbin)); if (children && gst_iterator_find_custom(children, (GCompareFunc)match_sinktype, &r, (gpointer)"GstDVBVideoSink")) { @@ -374,10 +370,7 @@ GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data) g_value_unset (&r); lt_info_c( "%s %s - video sink created\n", FILENAME, __FUNCTION__); } - gst_iterator_free(children); - } - break; } break; @@ -415,13 +408,13 @@ GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data) return GST_BUS_DROP; } + cPlayback::cPlayback(int num) { lt_info( "%s:%s\n", FILENAME, __FUNCTION__); const gchar *nano_str; guint major, minor, micro, nano; - /* init gstreamer */ gst_init(NULL, NULL); gst_version (&major, &minor, µ, &nano); @@ -450,14 +443,13 @@ cPlayback::cPlayback(int num) first = false; } -/* called at housekepping */ cPlayback::~cPlayback() { lt_info( "%s:%s\n", FILENAME, __FUNCTION__); //FIXME: all deleting stuff is done in Close() pthread_mutex_lock (&mutex_tag_ist); if (m_stream_tags) - gst_tag_list_free(m_stream_tags); + gst_tag_list_unref(m_stream_tags); pthread_mutex_unlock (&mutex_tag_ist); } @@ -619,14 +611,12 @@ bool cPlayback::Start(char *filename, int /*vpid*/, int /*vtype*/, int /*apid*/, flags |= GST_PLAY_FLAG_BUFFERING; } - // set flags g_object_set(G_OBJECT (m_gst_playbin), "flags", flags, NULL); - // set uri g_object_set(G_OBJECT (m_gst_playbin), "uri", uri, NULL); //gstbus handler - GstBus * bus = gst_pipeline_get_bus(GST_PIPELINE(m_gst_playbin)); + GstBus * bus = gst_pipeline_get_bus( GST_PIPELINE(m_gst_playbin) ); gst_bus_set_sync_handler(bus, Gst_bus_call, NULL, NULL); if (bus) gst_object_unref(bus); @@ -683,7 +673,6 @@ bool cPlayback::Stop(void) { if(playing == false) return false; - lt_info( "%s:%s playing %d\n", FILENAME, __FUNCTION__, playing); // stop @@ -857,7 +846,7 @@ bool cPlayback::GetPosition(int &position, int &duration) lt_info( "%s - %d failed\n", __FUNCTION__, __LINE__); } } - position = pts / 1000000.0; + position = pts / 1000000.0; // duration GstFormat fmt_d = GST_FORMAT_TIME; //Returns time in nanosecs double length = 0; @@ -1008,7 +997,7 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu gst_tag_list_free(tags); } } - *numpida = i; + *numpida=i; } }