Updating branch refs/heads/master
to 21c3dc29572dbd477f14ae7d197166fe698c831e (commit)
from 8fff89e99d139620fcce992508302577cb1d9442 (commit)
commit 21c3dc29572dbd477f14ae7d197166fe698c831e
Author: Ali Abdallah <a...@ali-xfce.org>
Date: Thu Oct 1 18:41:38 2009 +0000
Don't fade sound on exit if playing video
parole/parole-gst.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/parole/parole-gst.c b/parole/parole-gst.c
index 63d0bc0..a4174c7 100644
--- a/parole/parole-gst.c
+++ b/parole/parole-gst.c
@@ -1513,6 +1513,8 @@ parole_gst_check_state_change_timeout (gpointer data)
static void
parole_gst_terminate_internal (ParoleGst *gst, gboolean fade_sound)
{
+ gboolean playing_video;
+
g_mutex_lock (gst->priv->lock);
parole_stream_init_properties (gst->priv->stream);
@@ -1522,7 +1524,11 @@ parole_gst_terminate_internal (ParoleGst *gst, gboolean
fade_sound)
parole_window_busy_cursor (GTK_WIDGET (gst)->window);
- if ( fade_sound && gst->priv->state == GST_STATE_PLAYING )
+ g_object_get (G_OBJECT (gst->priv->stream),
+ "has-video", &playing_video,
+ NULL);
+
+ if ( fade_sound && gst->priv->state == GST_STATE_PLAYING && playing_video )
{
gdouble volume;
gdouble step;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
