[banshee/stable-2.6] libbanshee: Only call volume set callback on Mac (bgo#686908)
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/stable-2.6] libbanshee: Only call volume set callback on Mac (bgo#686908)
- Date: Mon, 2 Sep 2013 12:54:29 +0000 (UTC)
commit 7797658ca8096c15d578d8e3f77241ed1516795a
Author: Timo Dörr <timo latecrew de>
Date: Mon Sep 2 14:47:27 2013 +0200
libbanshee: Only call volume set callback on Mac (bgo#686908)
The fix[1] for bgo#660012[2] created the regression of not remembering the
volume of the last session. By making this fix only apply to Mac platform
we essentially go back to Banshee 2.4.x behaviour of displaying no apparent
audio volume, in Linux, until a track is played. Fixes bgo#686908.
[1] https://git.gnome.org/browse/banshee/commit/?id=96ee436bbf95bad7565e494555695f797f0382d0
[2] https://bugzilla.gnome.org/show_bug.cgi?id=660012
[3] https://bugzilla.gnome.org/show_bug.cgi?id=686908
Signed-off-by: Andrés G. Aragoneses <knocte gmail com>
libbanshee/banshee-player-pipeline.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
index ed845f3..4dae104 100644
--- a/libbanshee/banshee-player-pipeline.c
+++ b/libbanshee/banshee-player-pipeline.c
@@ -360,9 +360,12 @@ _bp_pipeline_construct (BansheePlayer *player)
player->volume = gst_element_factory_make ("volume", NULL);
g_return_val_if_fail (player->volume != NULL, FALSE);
+// gstreamer on OS X does not call the callback upon initialization (see bgo#680917)
+#ifdef __APPLE__
// call the volume changed callback once so the volume from the pipeline is
// set in the player object
bp_volume_changed_callback (player->playbin, NULL, player);
+#endif
audiosinkqueue = gst_element_factory_make ("queue", "audiosinkqueue");
g_return_val_if_fail (audiosinkqueue != NULL, FALSE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]