aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2012-05-04 17:10:35 +0200
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2012-05-04 17:10:35 +0200
commit94f3d0f50d008e8b11c1a4b35a46b602f43802a2 (patch)
tree7104ceb9fc63df8831a8c65869844542b8005358
parent2310c3b793c72948f07cb1cb9f6a0e2ad0e6d959 (diff)
downloadgtk-vlc-player-94f3d0f50d008e8b11c1a4b35a46b602f43802a2.tar.gz
some header-including cleanup
-rw-r--r--lib/gtk-vlc-player/gtk-vlc-player.c3
-rw-r--r--src/main.c18
2 files changed, 5 insertions, 16 deletions
diff --git a/lib/gtk-vlc-player/gtk-vlc-player.c b/lib/gtk-vlc-player/gtk-vlc-player.c
index 82c33ac..b2272a0 100644
--- a/lib/gtk-vlc-player/gtk-vlc-player.c
+++ b/lib/gtk-vlc-player/gtk-vlc-player.c
@@ -9,12 +9,11 @@
#include <gdk/gdkwin32.h>
#else
#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
#endif
#include <vlc/vlc.h>
-#include <gtk-vlc-player.h>
+#include "gtk-vlc-player.h"
static void gtk_vlc_player_class_init(GtkVlcPlayerClass *klass);
static void gtk_vlc_player_init(GtkVlcPlayer *klass);
diff --git a/src/main.c b/src/main.c
index 8b3e8b1..df2f9ef 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,20 +2,11 @@
#include "config.h"
#endif
-#define _GNU_SOURCE
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-
-#include <gtk/gtk.h>
-#ifdef __WIN32__
-#include <gdk/gdkwin32.h>
-#else
-#include <gdk/gdkx.h>
+#ifdef HAVE_X11_XLIB_H
#include <X11/Xlib.h>
#endif
+#include <gtk/gtk.h>
#include <gtk-vlc-player.h>
int
@@ -24,7 +15,7 @@ main(int argc, char *argv[])
GtkWidget *window, *player;
/* init threads */
-#ifndef __WIN32__
+#ifdef HAVE_X11_XLIB_H
XInitThreads(); /* FIXME: really required??? */
#endif
g_thread_init(NULL);
@@ -45,11 +36,10 @@ main(int argc, char *argv[])
gtk_container_add(GTK_CONTAINER(window), player);
gtk_vlc_player_load(GTK_VLC_PLAYER(player), argv[1]);
+ gtk_vlc_player_play(GTK_VLC_PLAYER(player));
gtk_widget_show_all(window);
- gtk_vlc_player_play(GTK_VLC_PLAYER(player));
-
gdk_threads_enter();
gtk_main();
gdk_threads_leave();