summaryrefslogtreecommitdiff
path: root/libre/clementine/remove-nonfree-artwork-and-spotify.patch
diff options
context:
space:
mode:
authorFreemor <freemor@freemor.ca>2019-02-03 20:41:46 -0400
committerFreemor <freemor@freemor.ca>2019-02-03 20:41:46 -0400
commit34f1a95e3cc391d2dbf2d9ab8a3d632962587847 (patch)
treec02d2952d479af6dbe28d4e447b9c8ab269cdd3a /libre/clementine/remove-nonfree-artwork-and-spotify.patch
parent68adb908a53814e3f18cfcce682850cbf86b98c6 (diff)
downloadabslibre-34f1a95e3cc391d2dbf2d9ab8a3d632962587847.tar.gz
abslibre-34f1a95e3cc391d2dbf2d9ab8a3d632962587847.tar.bz2
abslibre-34f1a95e3cc391d2dbf2d9ab8a3d632962587847.zip
rebuild [libre/clementine] to fix #1984. Much thanks to CommodoreCrunch
Diffstat (limited to 'libre/clementine/remove-nonfree-artwork-and-spotify.patch')
-rw-r--r--libre/clementine/remove-nonfree-artwork-and-spotify.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/libre/clementine/remove-nonfree-artwork-and-spotify.patch b/libre/clementine/remove-nonfree-artwork-and-spotify.patch
index 297cb5cb8..9dc0fdbf6 100644
--- a/libre/clementine/remove-nonfree-artwork-and-spotify.patch
+++ b/libre/clementine/remove-nonfree-artwork-and-spotify.patch
@@ -603,9 +603,9 @@ index 4d3e4d5..5de0663 100644
-
static const int kMaxRedirects = 3;
};
-
+
diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp
-index c3fde67..39f4410 100644
+index c3fde67..a1188be 100644
--- a/src/engines/gstenginepipeline.cpp
+++ b/src/engines/gstenginepipeline.cpp
@@ -34,8 +34,6 @@
@@ -670,7 +670,7 @@ index c3fde67..39f4410 100644
return ReplaceDecodeBin(new_bin);
}
-@@ -923,17 +891,7 @@ GstPadProbeReturn GstEnginePipeline::EventHandoffCallback(GstPad*,
+@@ -923,16 +891,8 @@ GstPadProbeReturn GstEnginePipeline::EventHandoffCallback(GstPad*,
void GstEnginePipeline::SourceDrainedCallback(GstURIDecodeBin* bin,
gpointer self) {
GstEnginePipeline* instance = reinterpret_cast<GstEnginePipeline*>(self);
@@ -684,12 +684,12 @@ index c3fde67..39f4410 100644
- !(instance->url_.scheme() != "spotify" &&
- instance->next_url_.scheme() == "spotify")) {
- instance->TransitionToNext();
-- }
-+ instance->TransitionToNext();
++ if (instance->has_next_valid_url()) {
++ instance->TransitionToNext();
+ }
}
- void GstEnginePipeline::SourceSetupCallback(GstURIDecodeBin* bin,
-@@ -1032,24 +990,6 @@ GstState GstEnginePipeline::state() const {
+@@ -1032,24 +992,6 @@ GstState GstEnginePipeline::state() const {
}
QFuture<GstStateChangeReturn> GstEnginePipeline::SetState(GstState state) {