[rhythmbox/gstreamer-0.11: 104/104] Merge branch 'master' into gstreamer-0.11
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox/gstreamer-0.11: 104/104] Merge branch 'master' into gstreamer-0.11
- Date: Tue, 15 May 2012 22:14:58 +0000 (UTC)
commit 75fb72df4db34aef560a9e80b8df574d3e13a7bd
Merge: 8693acf 39ab91a
Author: Jonathan Matthew <jonathan d14n org>
Date: Wed May 16 08:04:44 2012 +1000
Merge branch 'master' into gstreamer-0.11
Conflicts:
backends/gstreamer/rb-player-gst-xfade.c
backends/gstreamer/rb-player-gst.c
.gitignore | 1 +
INSTALL.quick | 2 +-
NEWS | 49 +
README | 2 +-
backends/gstreamer/rb-encoder-gst.c | 8 +-
backends/gstreamer/rb-player-gst-xfade.c | 100 +-
backends/gstreamer/rb-player-gst.c | 22 +-
bindings/gi/Makefile.am | 2 +
configure.ac | 40 +-
data/icons/hicolor/48x48/Makefile.am | 2 +-
data/icons/hicolor/48x48/status/Makefile.am | 11 +
.../48x48/status/rhythmbox-missing-artwork.png | Bin 0 -> 722 bytes
data/org.gnome.rhythmbox.gschema.xml | 53 +-
data/rhythmbox.gep | 10 +
data/ui/general-prefs.ui | 180 +-
data/ui/library-prefs.ui | 112 +-
data/ui/rhythmbox-ui.xml | 7 +-
doc/reference/rhythmbox-sections.txt | 2 -
help/es/es.po | 104 +-
lib/rb-file-helpers.c | 3 +-
lib/rb-gst-media-types.c | 168 +-
lib/rb-gst-media-types.h | 6 +
lib/rb-stock-icons.c | 1 +
lib/rb-stock-icons.h | 1 +
lib/rb-tree-dnd.c | 6 +-
lib/rb-util.c | 43 +-
lib/rb-util.h | 1 +
macros/gsettings.m4 | 37 +-
metadata/rb-metadata-dbus-service.c | 1 +
metadata/rb-metadata-dbus.c | 62 +-
metadata/rb-metadata-gst.c | 130 +-
plugins/Makefile.am | 1 -
plugins/artdisplay/Makefile.am | 19 -
plugins/artdisplay/artdisplay.plugin.in | 13 -
plugins/artdisplay/artdisplay.py | 411 -
plugins/artdisplay/rhythmbox-missing-artwork.svg | 832 --
plugins/artsearch/local.py | 2 +-
plugins/audiocd/Makefile.am | 8 +
plugins/audiocd/rb-audiocd-source.c | 10 +
plugins/audiocd/sj-error.h | 3 +-
plugins/audiocd/sj-metadata-getter.c | 20 +-
plugins/audiocd/sj-metadata-gvfs.c | 4 +
plugins/audiocd/sj-metadata-musicbrainz4.c | 615 ++
plugins/audiocd/sj-metadata-musicbrainz4.h | 56 +
plugins/audiocd/sj-metadata.c | 9 +
plugins/audiocd/sj-structures.c | 22 +
plugins/audiocd/sj-structures.h | 25 +
plugins/audioscrobbler/rb-audioscrobbler-entry.c | 6 +-
.../rb-audioscrobbler-profile-page.c | 4 +-
.../rb-audioscrobbler-radio-source.c | 2 +-
plugins/audioscrobbler/rb-audioscrobbler.c | 6 +-
plugins/daap/rb-daap-source.c | 6 +-
.../rb-dbus-media-server-plugin.c | 24 +-
plugins/generic-player/rb-generic-player-source.c | 37 +-
plugins/grilo/rb-grilo-source.c | 2 +-
plugins/ipod/rb-ipod-db.c | 2 +
plugins/ipod/rb-ipod-plugin.c | 5 +-
plugins/ipod/rb-ipod-source.c | 240 +-
plugins/ipod/rb-ipod-source.h | 3 +
plugins/ipod/rb-ipod-static-playlist-source.c | 262 +-
plugins/ipod/rb-ipod-static-playlist-source.h | 5 -
plugins/iradio/rb-iradio-source.c | 3 +-
...{BuyAlbumHandler.py => DownloadAlbumHandler.py} | 6 +-
plugins/magnatune/MagnatuneAccount.py | 89 +
plugins/magnatune/MagnatuneSource.py | 150 +-
plugins/magnatune/Makefile.am | 3 +-
plugins/magnatune/TrackListHandler.py | 15 +-
plugins/magnatune/magnatune-prefs.ui | 342 +-
plugins/magnatune/magnatune.py | 161 +-
plugins/mpris/rb-mpris-plugin.c | 75 +-
plugins/mtpdevice/rb-mtp-source.c | 88 +-
po/POTFILES.in | 3 +-
po/ar.po | 8036 ++++++++++++--------
po/cs.po | 997 ++--
po/de.po | 2359 +++----
po/es.po | 935 ++--
po/fr.po | 2049 +++---
po/gl.po | 924 ++--
po/hu.po | 867 ++--
po/it.po | 6075 ++++++++-------
po/ja.po | 2729 ++++----
po/lt.po | 2198 +++---
po/lv.po | 3567 +++++-----
po/pl.po | 1718 ++---
po/pt_BR.po | 693 +-
po/sl.po | 835 ++-
po/sr.po | 837 ++-
po/sr latin po | 837 ++-
po/sv.po | 4208 ++++++-----
po/te.po | 2351 +++---
po/uk.po | 1855 +++---
po/zh_CN.po | 4004 +++++-----
po/zh_HK.po | 759 +-
po/zh_TW.po | 767 +-
podcast/rb-podcast-source.c | 3 +-
remote/dbus/rb-client.c | 4 +-
rhythmdb/rb-refstring.c | 2 +-
rhythmdb/rhythmdb-query-result-list.c | 15 +
rhythmdb/rhythmdb-query-result-list.h | 3 -
rhythmdb/rhythmdb.c | 3 +-
shell/rb-shell-player.c | 167 +-
shell/rb-shell-player.h | 6 +-
shell/rb-shell-preferences.c | 46 -
shell/rb-shell.c | 288 +-
shell/rb-track-transfer-batch.c | 23 +
shell/rb-track-transfer-batch.h | 3 +
sources/rb-auto-playlist-source.c | 3 +-
sources/rb-browser-source.c | 3 +-
sources/rb-display-page-model.c | 23 +
sources/rb-display-page-model.h | 3 +
sources/rb-import-errors-source.c | 2 +-
sources/rb-library-source.c | 334 +-
sources/rb-media-player-source.c | 15 +-
sources/rb-source.c | 45 +-
sources/rb-source.h | 11 +-
sources/rb-static-playlist-source.c | 3 +-
sources/rb-streaming-source.c | 5 +-
sources/rb-transfer-target.c | 25 +-
sources/rb-transfer-target.h | 2 +-
sources/sync/rb-sync-state-ui.c | 2 +-
widgets/Makefile.am | 8 +-
widgets/gossip-cell-renderer-expander.c | 6 +-
widgets/rb-alert-dialog.c | 4 +-
widgets/rb-cell-renderer-pixbuf.c | 6 +-
widgets/rb-cell-renderer-rating.c | 6 +-
widgets/rb-fading-image.c | 681 ++
widgets/rb-fading-image.h | 68 +
widgets/rb-header.c | 660 ++-
widgets/rb-header.h | 11 +-
widgets/rb-object-property-editor.c | 415 +
widgets/rb-object-property-editor.h | 67 +
widgets/rb-query-creator-properties.c | 4 +-
widgets/rb-query-creator.c | 2 +-
widgets/rb-rating.c | 4 +-
widgets/rb-song-info.c | 2 +-
widgets/rb-source-toolbar.c | 17 +-
widgets/test-rb-segmented-bar.c | 2 +-
137 files changed, 30356 insertions(+), 27001 deletions(-)
---
diff --cc backends/gstreamer/rb-player-gst-xfade.c
index 2deaa57,e6e1b73..ecceaad
--- a/backends/gstreamer/rb-player-gst-xfade.c
+++ b/backends/gstreamer/rb-player-gst-xfade.c
@@@ -1779,8 -1782,11 +1797,10 @@@ rb_player_gst_xfade_bus_cb (GstBus *bus
case FADING_OUT_PAUSED:
{
/* try to seek back a bit to account for the fade */
- GstFormat format = GST_FORMAT_TIME;
gint64 pos = -1;
+
+ g_mutex_lock (stream->lock);
- gst_element_query_position (stream->volume, &format, &pos);
+ gst_element_query_position (stream->volume, GST_FORMAT_TIME, &pos);
if (pos != -1) {
stream->seek_target = pos > PAUSE_FADE_LENGTH ? pos - PAUSE_FADE_LENGTH : 0;
stream->state = SEEKING_PAUSED;
@@@ -2027,6 -2079,8 +2099,7 @@@ create_stream (RBPlayerGstXFade *player
GstCaps *caps;
GValueArray *stream_filters = NULL;
GstElement *tail;
- GstController *controller;
+ int i;
rb_debug ("creating new stream for %s (stream data %p)", uri, stream_data);
stream = g_object_new (RB_TYPE_XFADE_STREAM, NULL, NULL);
@@@ -2036,9 -2090,17 +2109,17 @@@
stream->uri = g_strdup (uri);
stream->state = WAITING;
+ stream->use_buffering = FALSE;
+ for (i = 0; i < G_N_ELEMENTS (stream_schemes); i++) {
+ if (gst_uri_has_protocol (uri, stream_schemes[i])) {
+ stream->use_buffering = TRUE;
+ break;
+ }
+ }
+
/* kill the floating reference */
g_object_ref (stream);
- gst_object_sink (stream);
+ gst_object_ref_sink (stream);
gst_element_set_locked_state (GST_ELEMENT (stream), TRUE);
stream->decoder = gst_element_factory_make ("uridecodebin", NULL);
if (stream->decoder == NULL) {
diff --cc backends/gstreamer/rb-player-gst.c
index 1abd6e4,aafcd71..11f6fc8
--- a/backends/gstreamer/rb-player-gst.c
+++ b/backends/gstreamer/rb-player-gst.c
@@@ -610,9 -609,20 +609,14 @@@ bus_cb (GstBus *bus, GstMessage *messag
}
static void
-source_notify_cb (GObject *object, GParamSpec *pspec, RBPlayerGst *player)
+source_setup_cb (GstElement *playbin, GstElement *source, RBPlayerGst *player)
{
- GstElement *source;
-
+ if (player->priv->uri == NULL) {
+ rb_debug ("got notify::source while changing to NULL");
+ return;
+ }
+
- g_object_get (object, "source", &source, NULL);
-
g_signal_emit (player, signals[PREPARE_SOURCE], 0, player->priv->uri, source);
-
- g_object_unref (source);
}
static gboolean
diff --cc configure.ac
index 02c3363,3644d32..c221243
--- a/configure.ac
+++ b/configure.ac
@@@ -43,13 -43,14 +43,14 @@@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT]
AC_C_BIGENDIAN
AC_CHECK_SIZEOF(long)
- GTK_REQS=2.91.4
+ GTK_REQS=3.2.0
-GST_0_10_REQS=0.10.32
+GST_0_11_REQS=0.11.0
GDK_PIXBUF_REQS=2.18.0
- GLIB_REQS=2.26.0
+ GLIB_REQS=2.28.0
LIBGPOD_REQS=0.6
MUSICBRAINZ3_REQS=3.0.2
+ MUSICBRAINZ4_REQS=4.0.0
TOTEM_PLPARSER_REQS=2.32.1
VALA_REQS=0.9.4
AVAHI_REQS=0.6
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
