summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2015-09-04 18:11:25 +0300
committerSebastian Dröge <sebastian@centricular.com>2015-09-04 18:11:25 +0300
commit83ec9abee77ef08fb2c5a265583996edad9d2b20 (patch)
tree004e6706a24247426ee51193ce7020d92e2dc005 /gtk
parenta44e7614f63e76d8b138d341ca976d79d243833f (diff)
gtk-play: Add compiler warning flags to the build and fix the warnings
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Makefile.am2
-rw-r--r--gtk/gtk-play.c21
2 files changed, 17 insertions, 6 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8e2331a..97ce95d 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -31,6 +31,6 @@ gtk_play_SOURCES = gtk-play.c gtk-play-resources.c gtk-video-renderer.c
LDADD = $(top_builddir)/lib/gst/player/.libs/libgstplayer-@GST_PLAYER_API_VERSION@.la \
$(GSTREAMER_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(GLIB_LIBS) $(LIBM) $(GMODULE_LIBS)
-AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(GSTREAMER_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(GSTREAMER_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(WARNING_CFLAGS)
noinst_HEADERS = gtk-play-resources.h gtk-video-renderer.h
diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c
index 906a672..aa45229 100644
--- a/gtk/gtk-play.c
+++ b/gtk/gtk-play.c
@@ -52,6 +52,7 @@
typedef GtkApplication GtkPlayApp;
typedef GtkApplicationClass GtkPlayAppClass;
+GType gtk_play_app_get_type (void);
G_DEFINE_TYPE (GtkPlayApp, gtk_play_app, GTK_TYPE_APPLICATION);
typedef struct
@@ -91,8 +92,20 @@ typedef struct
typedef GtkApplicationWindowClass GtkPlayClass;
+GType gtk_play_get_type (void);
G_DEFINE_TYPE (GtkPlay, gtk_play, GTK_TYPE_APPLICATION_WINDOW);
+void rewind_button_clicked_cb (GtkButton * button, GtkPlay * play);
+void forward_button_clicked_cb (GtkButton * button, GtkPlay * play);
+void play_pause_button_clicked_cb (GtkButton * button, GtkPlay * play);
+void prev_button_clicked_cb (GtkButton * button, GtkPlay * play);
+void next_button_clicked_cb (GtkButton * button, GtkPlay * play);
+void media_info_dialog_button_clicked_cb (GtkButton * button, GtkPlay * play);
+void fullscreen_button_toggled_cb (GtkToggleButton * widget, GtkPlay * play);
+void seekbar_value_changed_cb (GtkRange * range, GtkPlay * play);
+void volume_button_value_changed_cb (GtkScaleButton * button, gdouble value,
+ GtkPlay * play);
+
enum
{
PROP_0,
@@ -1071,7 +1084,7 @@ create_visualization_menu (GtkPlay * play)
sep = gtk_separator_menu_item_new ();
item = gtk_radio_menu_item_new_with_label (group, "Disable");
group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
- g_object_set_data (G_OBJECT (item), "name", "disable");
+ g_object_set_data (G_OBJECT (item), "name", (gpointer) "disable");
if (cur_vis == NULL)
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), True);
g_signal_connect (G_OBJECT (item), "toggled",
@@ -1400,7 +1413,6 @@ static void
create_ui (GtkPlay * play)
{
GtkWidget *main_hbox;
- GstElement *playbin, *gtk_sink;
gtk_window_set_default_size (GTK_WINDOW (play), 640, 480);
@@ -1488,8 +1500,7 @@ create_ui (GtkPlay * play)
/* apply css on widgets */
gtk_widget_apply_css (play->toolbar, "/css/toolbar.css");
- if (!gtk_sink)
- gtk_widget_realize (play->video_area);
+ gtk_widget_realize (play->video_area);
gtk_widget_hide (play->video_area);
/* start toolbar autohide timer */
@@ -1867,7 +1878,7 @@ gtk_play_app_class_init (GtkPlayAppClass * klass)
application_class->command_line = gtk_play_app_command_line;
}
-GtkPlayApp *
+static GtkPlayApp *
gtk_play_app_new (void)
{
GtkPlayApp *self;