Commit 97bea5d9 authored by hark's avatar hark
Browse files

ifdef gtk in common.h

parent 7e6fab4e
......@@ -8,19 +8,19 @@ CFLAGS= -O0 -march=native -Wall -Wextra -Wno-unused-parameter -Wno-unused-variab
#-std=c99
# -Werror -Wconversion -Wsign-conversion
all : c-player c-player-0.10 c-player-debug vartest snowControl s2s s2s-cli bigscreen
all : c-player c-player-0.10 c-player-debug snowControl
rot13: rot13.c
gcc -DTESTING -DGTK -g rot13.c -o rot13 `pkg-config --cflags --libs libevent gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gtk+-2.0 gstreamer-0.10` $(CFLAGS)
#rot13: rot13.c
# gcc -DTESTING -DGTK -g rot13.c -o rot13 `pkg-config --cflags --libs libevent gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gtk+-2.0 gstreamer-0.10` $(CFLAGS)
tcpclient: tcpclient.c
gcc -DTESTING -DGTK -g tcpclient.c -o tcpclient `pkg-config --cflags --libs gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gtk+-2.0 gstreamer-0.10` $(CFLAGS)
#tcpclient: tcpclient.c
# gcc -DTESTING -DGTK -g tcpclient.c -o tcpclient `pkg-config --cflags --libs gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gtk+-2.0 gstreamer-0.10` $(CFLAGS)
vartest: vartest.c
gcc -DTESTING -DGTK -g vartest.c snowbin.c wraps.c -o vartest `pkg-config --cflags --libs gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gtk+-2.0 gstreamer-0.10` $(CFLAGS)
#vartest: vartest.c
# gcc -DTESTING -DGTK -g vartest.c snowbin.c wraps.c -o vartest `pkg-config --cflags --libs gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gtk+-2.0 gstreamer-0.10` $(CFLAGS)
#switchs: switchs.c
# gcc -DTESTING -DGTK -g switchs.c -o switchs `pkg-config --cflags --libs gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gtk+-2.0 gstreamer-0.10` $(CFLAGS)
......
......@@ -135,27 +135,22 @@ struct snowData {
int audiosink;
};
#ifndef CLI
// globall vars
GtkWidget *loaded_label;
gboolean playabool;
/* Structure to contain all our information, so we can pass it around */
typedef struct PlayerData PlayerData;
struct PlayerData{
//gstreamer
GstElement *playbin2; /* Our one and only pipeline */
GstDiscoverer *discoverer;
GstState state; /* Current state of the pipeline */
gint64 duration; /* Duration of the clip, in nanoseconds */
//gtk
#ifdef GTK
GtkWidget *slider; /* Slider widget to keep track of current position */
GtkWidget *streams_list; /* Text widget to display info about the streams */
gulong slider_update_signal_id; /* Signal ID for the slider update signal */
GstState state; /* Current state of the pipeline */
gint64 duration; /* Duration of the clip, in nanoseconds */
#endif
snowData *snow;
};
......@@ -164,6 +159,12 @@ struct PlayerData{
PlayerData *pData;
//CustomData *data;
// depreciated globall vars
#ifdef GTK
GtkWidget *loaded_label;
GtkWidget *playlist_view;
GtkWidget *playlist_box;
#endif
gboolean playabool;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment