mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-22 20:10:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

playback/player: Fix indention

Browse source
This commit is contained in:
Sebastian Dröge 2015-05-07 13:21:02 +02:00
parent 1232e80e20
commit 7396c221ed
1 changed files with 40 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
playback/player/gtk/gtk-play.c
View file

@ -198,6 +198,7 @@ audio_channels_string (gint num)
else else
return "unknown"; return "unknown";
} }
static gchar * static gchar *
stream_info_get_string (GstPlayerStreamInfo * stream, gint type, gboolean label) stream_info_get_string (GstPlayerStreamInfo * stream, gint type, gboolean label)
{ {
@ -517,14 +518,14 @@ volume_changed_cb (GtkScaleButton * button, gdouble value, GtkPlay * play)
} }
static gint static gint
_get_current_track_index (GtkPlay * play, void * (*func) (GstPlayer * player)) _get_current_track_index (GtkPlay * play, void *(*func) (GstPlayer * player))
{ {
void *obj; void *obj;
gint index = -1; gint index = -1;
obj = func (play->player); obj = func (play->player);
if (obj) { if (obj) {
index = gst_player_stream_info_get_index ((GstPlayerStreamInfo*) obj); index = gst_player_stream_info_get_index ((GstPlayerStreamInfo *) obj);
g_object_unref (obj); g_object_unref (obj);
} }
@ -536,17 +537,17 @@ get_current_track_index (GtkPlay * play, GType type)
{ {
if (type == GST_TYPE_PLAYER_VIDEO_INFO) if (type == GST_TYPE_PLAYER_VIDEO_INFO)
return _get_current_track_index (play, return _get_current_track_index (play,
(void*) gst_player_get_current_video_track); (void *) gst_player_get_current_video_track);
else if (type == GST_TYPE_PLAYER_AUDIO_INFO) else if (type == GST_TYPE_PLAYER_AUDIO_INFO)
return _get_current_track_index (play, return _get_current_track_index (play,
(void*) gst_player_get_current_audio_track); (void *) gst_player_get_current_audio_track);
else else
return _get_current_track_index (play, return _get_current_track_index (play,
(void*) gst_player_get_current_subtitle_track); (void *) gst_player_get_current_subtitle_track);
} }
static gchar * static gchar *
get_menu_label (GstPlayerStreamInfo *stream, GType type) get_menu_label (GstPlayerStreamInfo * stream, GType type)
{ {
if (type == GST_TYPE_PLAYER_AUDIO_INFO) { if (type == GST_TYPE_PLAYER_AUDIO_INFO) {
gchar *label = NULL; gchar *label = NULL;
@ -559,12 +560,11 @@ get_menu_label (GstPlayerStreamInfo *stream, GType type)
if (lang) { if (lang) {
label = g_strdup_printf ("%s %s [%s]", codec ? codec : "", label = g_strdup_printf ("%s %s [%s]", codec ? codec : "",
channels ? channels : "", lang); channels ? channels : "", lang);
g_free (lang); g_free (lang);
} } else
else
label = g_strdup_printf ("%s %s", codec ? codec : "", label = g_strdup_printf ("%s %s", codec ? codec : "",
channels ? channels : ""); channels ? channels : "");
g_free (codec); g_free (codec);
g_free (channels); g_free (channels);
@ -613,11 +613,11 @@ track_changed_cb (GtkWidget * widget, GtkPlay * play)
gint index; gint index;
/* check if button is toggled */ /* check if button is toggled */
if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widget))) if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)))
return; return;
index = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(widget), "index")); index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "index"));
type = GPOINTER_TO_SIZE (g_object_get_data(G_OBJECT(widget), "type")); type = GPOINTER_TO_SIZE (g_object_get_data (G_OBJECT (widget), "type"));
if (index == -1) if (index == -1)
disable_track (play, type); disable_track (play, type);
@ -626,8 +626,7 @@ track_changed_cb (GtkWidget * widget, GtkPlay * play)
} }
static GtkWidget * static GtkWidget *
create_tracks_menu (GtkPlay * play, GstPlayerMediaInfo * media_info, create_tracks_menu (GtkPlay * play, GstPlayerMediaInfo * media_info, GType type)
GType type)
{ {
GtkWidget *menu; GtkWidget *menu;
GtkWidget *item; GtkWidget *item;
@ -649,30 +648,30 @@ create_tracks_menu (GtkPlay * play, GstPlayerMediaInfo * media_info,
for (l = list; l != NULL; l = l->next) { for (l = list; l != NULL; l = l->next) {
gint index; gint index;
gchar *buffer; gchar *buffer;
GstPlayerStreamInfo *s = (GstPlayerStreamInfo*) l->data; GstPlayerStreamInfo *s = (GstPlayerStreamInfo *) l->data;
buffer = get_menu_label (s, type); buffer = get_menu_label (s, type);
item = gtk_radio_menu_item_new_with_label (group, buffer); item = gtk_radio_menu_item_new_with_label (group, buffer);
group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM(item)); group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
index = gst_player_stream_info_get_index (s); index = gst_player_stream_info_get_index (s);
g_object_set_data (G_OBJECT(item), "index", GINT_TO_POINTER (index)); g_object_set_data (G_OBJECT (item), "index", GINT_TO_POINTER (index));
g_object_set_data (G_OBJECT(item), "type", GSIZE_TO_POINTER (type)); g_object_set_data (G_OBJECT (item), "type", GSIZE_TO_POINTER (type));
if (current_index == index) if (current_index == index)
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), True); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), True);
g_free (buffer); g_free (buffer);
g_signal_connect (G_OBJECT(item), "toggled", g_signal_connect (G_OBJECT (item), "toggled",
G_CALLBACK (track_changed_cb), play); G_CALLBACK (track_changed_cb), play);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
} }
item = gtk_radio_menu_item_new_with_label (group, "Disable"); item = gtk_radio_menu_item_new_with_label (group, "Disable");
group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM(item)); group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
g_object_set_data (G_OBJECT(item), "index", GINT_TO_POINTER (-1)); g_object_set_data (G_OBJECT (item), "index", GINT_TO_POINTER (-1));
g_object_set_data (G_OBJECT(item), "type", GSIZE_TO_POINTER (type)); g_object_set_data (G_OBJECT (item), "type", GSIZE_TO_POINTER (type));
if (current_index == -1) if (current_index == -1)
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), True); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), True);
g_signal_connect (G_OBJECT(item), "toggled", g_signal_connect (G_OBJECT (item), "toggled",
G_CALLBACK (track_changed_cb), play); G_CALLBACK (track_changed_cb), play);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
return menu; return menu;
} }
@ -703,7 +702,7 @@ gtk_player_popup_menu_create (GtkPlay * play, GdkEventButton * event)
else { else {
submenu = create_tracks_menu (play, media_info, GST_TYPE_PLAYER_VIDEO_INFO); submenu = create_tracks_menu (play, media_info, GST_TYPE_PLAYER_VIDEO_INFO);
if (submenu) if (submenu)
gtk_menu_item_set_submenu (GTK_MENU_ITEM(video), submenu); gtk_menu_item_set_submenu (GTK_MENU_ITEM (video), submenu);
} }
if (!gst_player_get_audio_streams (media_info)) if (!gst_player_get_audio_streams (media_info))
@ -711,7 +710,7 @@ gtk_player_popup_menu_create (GtkPlay * play, GdkEventButton * event)
else { else {
submenu = create_tracks_menu (play, media_info, GST_TYPE_PLAYER_AUDIO_INFO); submenu = create_tracks_menu (play, media_info, GST_TYPE_PLAYER_AUDIO_INFO);
if (submenu) if (submenu)
gtk_menu_item_set_submenu (GTK_MENU_ITEM(audio), submenu); gtk_menu_item_set_submenu (GTK_MENU_ITEM (audio), submenu);
} }
if (!gst_player_get_subtitle_streams (media_info)) if (!gst_player_get_subtitle_streams (media_info))
@ -720,28 +719,28 @@ gtk_player_popup_menu_create (GtkPlay * play, GdkEventButton * event)
submenu = create_tracks_menu (play, media_info, submenu = create_tracks_menu (play, media_info,
GST_TYPE_PLAYER_SUBTITLE_INFO); GST_TYPE_PLAYER_SUBTITLE_INFO);
if (submenu) if (submenu)
gtk_menu_item_set_submenu (GTK_MENU_ITEM(sub), submenu); gtk_menu_item_set_submenu (GTK_MENU_ITEM (sub), submenu);
} }
g_signal_connect (G_OBJECT (info), "activate", g_signal_connect (G_OBJECT (info), "activate",
G_CALLBACK (media_info_clicked_cb), play); G_CALLBACK (media_info_clicked_cb), play);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), video); gtk_menu_shell_append (GTK_MENU_SHELL (menu), video);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), audio); gtk_menu_shell_append (GTK_MENU_SHELL (menu), audio);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), sub); gtk_menu_shell_append (GTK_MENU_SHELL (menu), sub);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), info); gtk_menu_shell_append (GTK_MENU_SHELL (menu), info);
gtk_widget_show_all (menu); gtk_widget_show_all (menu);
gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
(event != NULL) ? event->button : 0, (event != NULL) ? event->button : 0,
gdk_event_get_time((GdkEvent*)event)); gdk_event_get_time ((GdkEvent *) event));
g_object_unref (media_info); g_object_unref (media_info);
} }
static void static void
mouse_button_pressed_cb (GtkWidget * unused, GdkEventButton * event, mouse_button_pressed_cb (GtkWidget * unused, GdkEventButton * event,
GtkPlay *play) GtkPlay * play)
{ {
/* we only care about right button pressed event */ /* we only care about right button pressed event */
if (event->button != 3) if (event->button != 3)
@ -766,10 +765,9 @@ create_ui (GtkPlay * play)
g_signal_connect (play->video_area, "button-press-event", g_signal_connect (play->video_area, "button-press-event",
G_CALLBACK (mouse_button_pressed_cb), play); G_CALLBACK (mouse_button_pressed_cb), play);
gtk_widget_set_events (play->video_area, GDK_EXPOSURE_MASK gtk_widget_set_events (play->video_area, GDK_EXPOSURE_MASK
| GDK_LEAVE_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK
| GDK_BUTTON_PRESS_MASK | GDK_BUTTON_PRESS_MASK
| GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
| GDK_POINTER_MOTION_HINT_MASK);
/* Unified play/pause button */ /* Unified play/pause button */
play->play_pause_button = play->play_pause_button =