[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ppa/oneiric, updated. debian/2.4.0-2ubuntu1-14-g7c309f3
Chow Loong Jin
hyperair at debian.org
Sun Jun 16 10:51:57 UTC 2013
The following commit has been merged in the ppa/oneiric branch:
commit 3358faca6d5d5f905802469d7f8768a0b3066b7a
Author: Chow Loong Jin <hyperair at debian.org>
Date: Sun Jun 16 18:37:09 2013 +0800
Revert "Add more patches for Gst1.0 port"
This reverts commit f1dd8ad5e93c21f599804e22cfe84cc55fbdcde2.
Conflicts:
debian/patches/series
diff --git a/debian/patches/LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch b/debian/patches/LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch
deleted file mode 100644
index fe711cf..0000000
--- a/debian/patches/LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo at circular-chaos.org>
-Date: Mon, 10 Jun 2013 14:35:42 +0200
-Subject: LastfmFingerprint: Clean up caps handling and make sure to wait until
- we know the audio caps
-
----
- .../liblastfmfpbridge/gst-lastfmfpbridge.cpp | 59 +++++++++++++---------
- 1 file changed, 36 insertions(+), 23 deletions(-)
-
-diff --git a/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp b/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp
-index c197b36..dcd8441 100644
---- a/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp
-+++ b/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp
-@@ -63,9 +63,8 @@ struct LastfmfpAudio {
- };
-
- static void
--Lastfmfp_cb_newpad(GstElement *decodebin, GstPad *pad, LastfmfpAudio *ma)
-+Lastfmfp_link_audio_pad(GstPad *pad, GstCaps *caps, LastfmfpAudio *ma)
- {
-- GstCaps *caps;
- GstStructure *str;
- GstPad *audiopad;
-
-@@ -77,21 +76,46 @@ Lastfmfp_cb_newpad(GstElement *decodebin, GstPad *pad, LastfmfpAudio *ma)
- }
-
- // check media type
-- caps = gst_pad_get_current_caps(pad);
- str = gst_caps_get_structure(caps, 0);
--
-- if (!g_strrstr(gst_structure_get_name(str), "audio")) {
-- gst_caps_unref(caps);
-+ if (!g_strrstr(gst_structure_get_name(str), "audio/")) {
- gst_object_unref(audiopad);
- return;
- }
-- gst_caps_unref(caps);
-+
-+ if (!gst_structure_get_int(str, "rate", &ma->filerate))
-+ ma->filerate = -1;
-+ if (!gst_structure_get_int(str, "channels", &ma->nchannels))
-+ ma->nchannels = -1;
-
- // link
- gst_pad_link(pad, audiopad);
- gst_object_unref(audiopad);
- }
-
-+static void
-+Lastfmfp_cb_caps_notify(GstPad *pad, GParamSpec *unused, LastfmfpAudio *ma)
-+{
-+ GstCaps *caps;
-+
-+ caps = gst_pad_get_current_caps(pad);
-+ Lastfmfp_link_audio_pad(pad, caps, ma);
-+ gst_caps_unref (caps);
-+}
-+
-+static void
-+Lastfmfp_cb_newpad(GstElement *decodebin, GstPad *pad, LastfmfpAudio *ma)
-+{
-+ GstCaps *caps;
-+
-+ caps = gst_pad_get_current_caps(pad);
-+ /* If we have no caps yet, wait until we have them */
-+ if (!caps) {
-+ g_signal_connect(pad, "notify::caps", G_CALLBACK(Lastfmfp_cb_caps_notify), ma);
-+ return;
-+ }
-+ gst_caps_unref(caps);
-+}
-+
- static void FingerprintFound(LastfmfpAudio *ma)
- {
- //we have the fingerprint
-@@ -221,18 +245,6 @@ Lastfmfp_initgstreamer(LastfmfpAudio *ma, const gchar *file)
- if (gst_element_set_state(ma->pipeline, GST_STATE_PAUSED) == GST_STATE_CHANGE_ASYNC) {
- gst_element_get_state(ma->pipeline, NULL, NULL, max_wait);
- }
--
-- GstPad *pad = gst_element_get_static_pad(sink, "sink");
-- GstCaps *caps = gst_pad_get_current_caps(pad);
-- if (GST_IS_CAPS(caps)) {
-- GstStructure *str = gst_caps_get_structure(caps, 0);
-- gst_structure_get_int(str, "rate", &ma->filerate);
-- gst_structure_get_int(str, "channels", &ma->nchannels);
-- } else {
-- ma->filerate = -1;
-- }
-- gst_caps_unref(caps);
-- gst_object_unref(pad);
- }
-
- extern "C" const char*
-@@ -248,11 +260,8 @@ Lastfmfp_decode(LastfmfpAudio *ma, const gchar *file, int* size, int* ret)
-
- // Gstreamer setup
- Lastfmfp_initgstreamer(ma, file);
-- //lastfm setup
-- ma->extractor = new fingerprint::FingerprintExtractor();
-- ma->extractor->initForQuery(ma->filerate, ma->nchannels, ma->seconds);
-
-- if (ma->filerate < 0) {
-+ if (ma->filerate < 0 || ma->nchannels < 0) {
- *size = 0;
- *ret = -1;
-
-@@ -263,6 +272,10 @@ Lastfmfp_decode(LastfmfpAudio *ma, const gchar *file, int* size, int* ret)
- return NULL;
- }
-
-+ //lastfm setup
-+ ma->extractor = new fingerprint::FingerprintExtractor();
-+ ma->extractor->initForQuery(ma->filerate, ma->nchannels, ma->seconds);
-+
- // decode...
- gst_element_set_state(ma->pipeline, GST_STATE_PLAYING);
- g_print("libLastfmfp: decoding %s\n", file);
diff --git a/debian/patches/Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch b/debian/patches/Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch
deleted file mode 100644
index 341d5ee..0000000
--- a/debian/patches/Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo at circular-chaos.org>
-Date: Mon, 10 Jun 2013 14:28:52 +0200
-Subject: Mirage: Clean up caps handling and make sure to wait until we know
- the audio caps
-
----
- src/Mirage/libmirageaudio/gst-mirageaudio.c | 50 ++++++++++++++++++-----------
- 1 file changed, 31 insertions(+), 19 deletions(-)
-
-diff --git a/src/Mirage/libmirageaudio/gst-mirageaudio.c b/src/Mirage/libmirageaudio/gst-mirageaudio.c
-index 292ba74..172354e 100644
---- a/src/Mirage/libmirageaudio/gst-mirageaudio.c
-+++ b/src/Mirage/libmirageaudio/gst-mirageaudio.c
-@@ -91,9 +91,8 @@ void toc()
- }
-
- static void
--mirageaudio_cb_newpad(GstElement *decodebin, GstPad *pad, MirageAudio *ma)
-+mirageaudio_link_audio_pad(GstPad *pad, GstCaps *caps, MirageAudio *ma)
- {
-- GstCaps *caps;
- GstStructure *str;
- GstPad *audiopad;
-
-@@ -105,15 +104,14 @@ mirageaudio_cb_newpad(GstElement *decodebin, GstPad *pad, MirageAudio *ma)
- }
-
- // check media type
-- caps = gst_pad_get_current_caps(pad);
- str = gst_caps_get_structure(caps, 0);
--
-- if (!g_strrstr(gst_structure_get_name(str), "audio")) {
-- gst_caps_unref(caps);
-+ if (!g_strrstr(gst_structure_get_name(str), "audio/")) {
- gst_object_unref(audiopad);
- return;
- }
-- gst_caps_unref(caps);
-+
-+ if (!gst_structure_get_int(str, "rate", &ma->filerate))
-+ ma->filerate = -1;
-
- // link
- gst_pad_link(pad, audiopad);
-@@ -121,6 +119,32 @@ mirageaudio_cb_newpad(GstElement *decodebin, GstPad *pad, MirageAudio *ma)
- }
-
- static void
-+mirageaudio_cb_caps_notify(GstPad *pad, GParamSpec *unused, MirageAudio *ma)
-+{
-+ GstCaps *caps;
-+
-+ caps = gst_pad_get_current_caps(pad);
-+ mirageaudio_link_audio_pad(pad, caps, ma);
-+ gst_caps_unref (caps);
-+}
-+
-+static void
-+mirageaudio_cb_newpad(GstElement *decodebin, GstPad *pad, MirageAudio *ma)
-+{
-+ GstCaps *caps;
-+
-+ caps = gst_pad_get_current_caps(pad);
-+ /* If we have no caps yet, wait until we have them */
-+ if (!caps) {
-+ g_signal_connect(pad, "notify::caps", G_CALLBACK(mirageaudio_cb_caps_notify), ma);
-+ return;
-+ }
-+
-+ mirageaudio_link_audio_pad(pad, caps, ma);
-+ gst_caps_unref (caps);
-+}
-+
-+static void
- mirageaudio_cb_have_data(GstElement *element, GstBuffer *buffer, GstPad *pad, MirageAudio *ma)
- {
- gint buffersamples;
-@@ -342,18 +366,6 @@ mirageaudio_initgstreamer(MirageAudio *ma, const gchar *file)
- if (gst_element_set_state(ma->pipeline, GST_STATE_PAUSED) == GST_STATE_CHANGE_ASYNC) {
- gst_element_get_state(ma->pipeline, NULL, NULL, max_wait);
- }
--
-- GstPad *pad = gst_element_get_static_pad(sink, "sink");
-- GstCaps *caps = gst_pad_get_current_caps(pad);
-- if (GST_IS_CAPS(caps)) {
-- GstStructure *str = gst_caps_get_structure(caps, 0);
-- gst_structure_get_int(str, "rate", &ma->filerate);
--
-- } else {
-- ma->filerate = -1;
-- }
-- gst_caps_unref(caps);
-- gst_object_unref(pad);
- }
-
- float*
--
banshee-community-extensions
More information about the Pkg-cli-apps-commits
mailing list