[gst-cvs] CVS: gst-oldplayer/libs/gst/mediaplay mediaplay.h,NONE,1.1 Makefile.am,1.1.1.1,1.2 callbacks.c,1.1.1.1,1.2 gstmediaplay.c,1.1.1.1,1.2 gstmediaplay.h,1.1.1.1,NONE

[Thomas V. S. <tho...@us...>]

Update of /cvsroot/gstreamer/gst-oldplayer/libs/gst/mediaplay
In directory usw-pr-cvs1:/tmp/cvs-serv9864/libs/gst/mediaplay

Modified Files:
	Makefile.am callbacks.c gstmediaplay.c 
Added Files:
	mediaplay.h 
Removed Files:
	gstmediaplay.h 
Log Message:
fixes


--- NEW FILE: mediaplay.h ---
#ifndef __GST_MEDIA_PLAY_H__
#define __GST_MEDIA_PLAY_H__

#include <glade/glade.h>
#include "gstplay.h"
#include "gststatusarea.h"

#define GST_TYPE_MEDIA_PLAY           (gst_media_play_get_type())
#define GST_MEDIA_PLAY(obj)           (GTK_CHECK_CAST ((obj), GST_TYPE_MEDIA_PLAY, GstMediaPlay))
#define GST_MEDIA_PLAY_CLASS(klass)   (GTK_CHECK_CLASS_CAST ((klass), GST_TYPE_MEDIA_PLAY, GstMediaPlayClass))
#define GST_IS_MEDIA_PLAY(obj)        (GTK_CHECK_TYPE ((obj), GST_TYPE_MEDIA_PLAY))
#define GST_IS_MEDIA_PLAY_CLASS(obj)  (GTK_CHECK_CLASS_TYPE ((klass), GST_TYPE_MEDIA_PLAY))

typedef struct _GstMediaPlay GstMediaPlay;
typedef struct _GstMediaPlayClass GstMediaPlayClass;

struct _GstMediaPlay {
	GtkObject parent;

	GladeXML *xml;
	GladeXML *playlist_xml;
	GstPlay *play;
	
	GtkWidget *play_button;
	GtkWidget *pause_button;
	GtkWidget *stop_button;
	GtkWidget *window;
	
	GstStatusArea *status;
	
	/* the slider */
	GtkAdjustment *adjustment;
	GtkWidget *slider;

	/* the playlist */
	GtkWidget *playlist_window;
	GtkWidget *playlist_clist;

	guint fullscreen_connection_id;
	
	gulong last_time;

	gint x, y, width, height;
};

struct _GstMediaPlayClass {
	GtkObjectClass parent_class;
};


GtkType 	gst_media_play_get_type		(void);

/* setup the player */
GstMediaPlay*	gst_media_play_new		  (void);

void 		gst_media_play_start_uri	  (GstMediaPlay *play, const guchar *uri);

void            gst_media_play_show_playlist      (GstMediaPlay *mplay);
void            gst_media_play_addto_playlist     (GstMediaPlay *mplay, char *uri);

void            gst_media_play_set_original_size  (GstMediaPlay *mplay);
void            gst_media_play_set_double_size    (GstMediaPlay *mplay);
void            gst_media_play_set_fullscreen     (GstMediaPlay *mplay);

#endif /* __GST_MEDIA_PLAY_H__ */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gst-oldplayer/libs/gst/mediaplay/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.am	2002/01/02 21:07:16	1.1.1.1
+++ Makefile.am	2002/01/02 21:13:46	1.2
@@ -1,34 +1,17 @@
-## Process this file with automake to produce Makefile.in
-
-# FIXME FIXME
-
-
-bin_PROGRAMS = gstmediaplay 
-
 lib_LTLIBRARIES = libgstmediaplay.la
 
-man_MANS = gstmediaplay.1
-
-gladedir = $(datadir)/gstmediaplay
-glade_DATA = gstmediaplay.glade play.xpm stop.xpm pause.xpm
-
-EXTRA_DIST = $(glade_DATA) $(man_MANS)
-
 libgstmediaplay_la_SOURCES = \
 	gstplay.c \
 	gstmediaplay.c \
 	gststatusarea.c \
 	callbacks.c
-
-gstmediaplay_SOURCES = \
-	main.c 
 
-libgstmediaplayincludedir = $(includedir)/gstplay
+libgstmediaplayincludedir = $(includedir)/mediaplay
 libgstmediaplayinclude_HEADERS = \
 	gstplay.h 
 
 noinst_HEADERS = \
-	gstmediaplay.h \
+	mediaplay.h \
 	gststatusarea.h \
 	callbacks.h
 
@@ -36,6 +19,3 @@
 	-DDATADIR=\""$(gladedir)/"\" $(LIBGLADE_CFLAGS)
 libgstmediaplay_la_LIBADD = $(GST_LIBS) $(GNOME_LIBS) $(LIBGLADE_LIBS)
 libgstmediaplay_la_LDFLAGS = -rdynamic
-
-gstmediaplay_CFLAGS = $(GST_CFLAGS) $(LIBGLADE_CFLAGS) $(GNOME_CFLAGS)
-gstmediaplay_LDADD = $(GST_LIBS) $(LIBGLADE_LIBS) $(GNOME_LIBS) libgstmediaplay.la

Index: callbacks.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-oldplayer/libs/gst/mediaplay/callbacks.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- callbacks.c	2002/01/02 21:07:11	1.1.1.1
+++ callbacks.c	2002/01/02 21:13:46	1.2
@@ -7,7 +7,7 @@
 #include <gst/gst.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "gstmediaplay.h"
+#include "mediaplay.h"
 #include "gstplay.h"
 #include "callbacks.h"
 

Index: gstmediaplay.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-oldplayer/libs/gst/mediaplay/gstmediaplay.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gstmediaplay.c	2002/01/02 21:07:13	1.1.1.1
+++ gstmediaplay.c	2002/01/02 21:13:46	1.2
@@ -7,7 +7,7 @@
 #ifdef USE_GLIB2
 #include <libgnomeui/libgnomeui.h>
 #endif
-#include "gstmediaplay.h"
+#include "mediaplay.h"
 #include "callbacks.h"
 
 static void gst_media_play_class_init	    (GstMediaPlayClass *klass);

--- gstmediaplay.h DELETED ---