diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-05-05 08:42:44 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-05-05 08:42:44 +0200 |
| commit | 3874830ea6c953fc29ef6286c1808b0e29b552aa (patch) | |
| tree | 5c6296676c178676453e0b7d6a44c9dd263dba9d | |
| parent | b2b1ca48d13f03b325c7a1923d0cac92bb974582 (diff) | |
| download | gtk-vlc-player-3874830ea6c953fc29ef6286c1808b0e29b552aa.tar.gz | |
remove unnecessary drawing_area class attribute (gtk-vlc-player)
| -rw-r--r-- | lib/gtk-vlc-player/gtk-vlc-player.c | 17 | ||||
| -rw-r--r-- | lib/gtk-vlc-player/gtk-vlc-player.h | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/lib/gtk-vlc-player/gtk-vlc-player.c b/lib/gtk-vlc-player/gtk-vlc-player.c index 93eeeca..81a3859 100644 --- a/lib/gtk-vlc-player/gtk-vlc-player.c +++ b/lib/gtk-vlc-player/gtk-vlc-player.c @@ -94,22 +94,23 @@ gtk_vlc_player_class_init(GtkVlcPlayerClass *klass) static void gtk_vlc_player_init(GtkVlcPlayer *klass) { - GdkColor color; - libvlc_event_manager_t *evman; + GtkWidget *drawing_area; + GdkColor color; + libvlc_event_manager_t *evman; gtk_alignment_set(GTK_ALIGNMENT(klass), 0., 0., 1., 1.); - klass->drawing_area = gtk_drawing_area_new(); - gtk_container_add(GTK_CONTAINER(klass), klass->drawing_area); + drawing_area = gtk_drawing_area_new(); + gtk_container_add(GTK_CONTAINER(klass), drawing_area); gdk_color_parse("black", &color); - gtk_widget_modify_bg(klass->drawing_area, GTK_STATE_NORMAL, &color); + gtk_widget_modify_bg(drawing_area, GTK_STATE_NORMAL, &color); - g_signal_connect(G_OBJECT(klass->drawing_area), "realize", + g_signal_connect(G_OBJECT(drawing_area), "realize", G_CALLBACK(widget_on_realize), klass); /* FIXME: must probably do via vlc events */ - gtk_widget_add_events(klass->drawing_area, GDK_BUTTON_PRESS_MASK); - g_signal_connect(G_OBJECT(klass->drawing_area), "button-press-event", + gtk_widget_add_events(drawing_area, GDK_BUTTON_PRESS_MASK); + g_signal_connect(G_OBJECT(drawing_area), "button-press-event", G_CALLBACK(widget_on_click), klass); klass->vlc_inst = libvlc_new(0, NULL); diff --git a/lib/gtk-vlc-player/gtk-vlc-player.h b/lib/gtk-vlc-player/gtk-vlc-player.h index 7a05f6e..1cef88b 100644 --- a/lib/gtk-vlc-player/gtk-vlc-player.h +++ b/lib/gtk-vlc-player/gtk-vlc-player.h @@ -24,8 +24,6 @@ G_BEGIN_DECLS typedef struct _GtkVlcPlayer { GtkAlignment parent_instance; - GtkWidget *drawing_area; - libvlc_instance_t *vlc_inst; libvlc_media_player_t *media_player; |