File 0001-Free-decoder-bin-if-error-occurs-during-se... of Package clementine

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Free-decoder-bin-if-error-occurs-during-setup.patch of Package clementine (Revision c19ba2309df02f3a9bd5563275d43d5d)

Currently displaying revision c19ba2309df02f3a9bd5563275d43d5d , Show latest

From ca8db288d57dec6dcfaadd94329af4668edc1bdb Mon Sep 17 00:00:00 2001
From: Jim Broadus <jbroadus@gmail.com>
Date: Fri, 22 Mar 2019 19:07:06 -0700
Subject: [PATCH] Free decoder bin if error occurs during setup.

In the case that an error occurs in ReplaceDecodeBin before the bin is added to
the pipeline, unreference the object to allow cleanup. This change also separates
CreateDecodeBinFromUrl from ReplaceDecodeBin, following the pattern of
CreateDecodeBinFromString.
---
 src/engines/gstenginepipeline.cpp | 26 ++++++++++++++++++++------
 src/engines/gstenginepipeline.h   |  1 +
 2 files changed, 21 insertions(+), 6 deletions(-)

Index: Clementine-36cc5b82f4daf5c2d4e93dc8072665e5a3ca622b/src/engines/gstenginepipeline.cpp
===================================================================
--- Clementine-36cc5b82f4daf5c2d4e93dc8072665e5a3ca622b.orig/src/engines/gstenginepipeline.cpp	2019-03-27 12:30:08.162577265 +0200
+++ Clementine-36cc5b82f4daf5c2d4e93dc8072665e5a3ca622b/src/engines/gstenginepipeline.cpp	2019-03-27 12:33:21.501836558 +0200
@@ -153,17 +153,28 @@ bool GstEnginePipeline::ReplaceDecodeBin
 }
 
 bool GstEnginePipeline::ReplaceDecodeBin(const QUrl& url) {
-  GstElement* new_bin = nullptr;
+  GstElement* new_bin = CreateDecodeBinFromUrl(url);
+  return ReplaceDecodeBin(new_bin);
+}
 
+GstElement* GstEnginePipeline::CreateDecodeBinFromUrl(const QUrl& url) {
+  GstElement* new_bin = nullptr;
 #ifdef HAVE_SPOTIFY
   if (url.scheme() == "spotify") {
     new_bin = gst_bin_new("spotify_bin");
+    if (!new_bin) return nullptr;
 
     // Create elements
     GstElement* src = engine_->CreateElement("tcpserversrc", new_bin);
-    if (!src) return false;
+    if (!src) {
+      gst_object_unref(GST_OBJECT(new_bin));
+      return nullptr;
+    }
     GstElement* gdp = engine_->CreateElement("gdpdepay", new_bin);
-    if (!gdp) return false;
+    if (!gdp) {
+      gst_object_unref(GST_OBJECT(new_bin));
+      return nullptr;
+    }
 
     // Pick a port number
     const int port = Utilities::PickUnusedPort();
@@ -196,7 +207,7 @@ bool GstEnginePipeline::ReplaceDecodeBin
       uri = url.toEncoded();
     }
     new_bin = engine_->CreateElement("uridecodebin");
-    if (!new_bin) return false;
+    if (!new_bin) return nullptr;
     g_object_set(G_OBJECT(new_bin), "uri", uri.constData(), nullptr);
     CHECKED_GCONNECT(G_OBJECT(new_bin), "drained", &SourceDrainedCallback,
                      this);
@@ -207,7 +218,7 @@ bool GstEnginePipeline::ReplaceDecodeBin
   }
 #endif
 
-  return ReplaceDecodeBin(new_bin);
+  return new_bin;
 }
 
 GstElement* GstEnginePipeline::CreateDecodeBinFromString(const char* pipeline) {
@@ -481,7 +492,10 @@ bool GstEnginePipeline::InitFromString(c
     return false;
   }
 
-  if (!ReplaceDecodeBin(new_bin)) return false;
+  if (!ReplaceDecodeBin(new_bin)) {
+    gst_object_unref(GST_OBJECT(new_bin));
+    return false;
+  }
 
   if (!Init()) return false;
   return gst_element_link(new_bin, audiobin_);
Index: Clementine-36cc5b82f4daf5c2d4e93dc8072665e5a3ca622b/src/engines/gstenginepipeline.h
===================================================================
--- Clementine-36cc5b82f4daf5c2d4e93dc8072665e5a3ca622b.orig/src/engines/gstenginepipeline.h	2019-03-27 12:30:08.162577265 +0200
+++ Clementine-36cc5b82f4daf5c2d4e93dc8072665e5a3ca622b/src/engines/gstenginepipeline.h	2019-03-27 12:31:00.916557865 +0200
@@ -151,6 +151,7 @@ signals:
 
   bool Init();
   GstElement* CreateDecodeBinFromString(const char* pipeline);
+  GstElement* CreateDecodeBinFromUrl(const QUrl& url);
 
   void UpdateVolume();
   void UpdateEqualizer();

Places

File 0001-Free-decoder-bin-if-error-occurs-during-setup.patch of Package clementine (Revision c19ba2309df02f3a9bd5563275d43d5d)

Places