Updating branch refs/heads/master
to 15f3f36da762e9053077f2be2c4d7119651c7b44 (commit)
from fecf07aa9574b3d47c8b630621bd4d87f56476e0 (commit)
commit 15f3f36da762e9053077f2be2c4d7119651c7b44
Author: Sean Davis <[email protected]>
Date: Sun Nov 18 06:50:08 2012 -0500
Applied patch from bug 9194: Only update subtitles when Parole is not
already updating language tracks.
src/parole-player.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index e3ec98b..6c30875 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2870,6 +2870,7 @@ void
parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, Parol
void parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget,
ParolePlayer *player)
{
gint audio_index =
gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack));
+ if (player->priv->update_languages == FALSE)
gst_set_current_audio_track(PAROLE_GST(player->priv->gst), audio_index);
parole_player_set_audiotrack_radio_menu_item_selected(player,
audio_index);
}
@@ -2877,6 +2878,7 @@ void
parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget, ParolePlay
void parole_player_combo_box_subtitles_changed_cb(GtkWidget *widget,
ParolePlayer *player)
{
gint sub_index =
gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_subtitles));
+ if (player->priv->update_languages == FALSE)
gst_set_current_subtitle_track(PAROLE_GST(player->priv->gst),
sub_index);
parole_player_set_subtitle_radio_menu_item_selected(player, sub_index);
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
