sinek/include common.h,1.50,1.51 gtkxine.h,1.8,1.9
[email protected] Mon, 17 Feb 2003 00:26:31 -0800
| Newsgroups | gmane.comp.video.sinek.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/sinek/sinek/include
In directory sc8-pr-cvs1:/tmp/cvs-serv23278/include
Modified Files:
common.h gtkxine.h
Log Message:
fixes all over the place
Index: common.h
===================================================================
RCS file: /cvsroot/sinek/sinek/include/common.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- common.h 21 Jan 2003 04:52:48 -0000 1.50
+++ common.h 17 Feb 2003 08:25:57 -0000 1.51
@@ -123,9 +123,11 @@
enum video_modes
{
+ VIDEO_NONE,
VIDEO_WINDOW,
+ VIDEO_HIDDEN,
VIDEO_BACKGROUND,
- VIDEO_FULLSCREEN
+ VIDEO_FULLSCREEN,
};
struct sinek_globals
@@ -133,6 +135,7 @@
/* xine library */
GtkWidget *xine;
GtkWidget *videowin;
+ enum video_modes video_mode;
/* command line options */
char *audio_id;
@@ -158,7 +161,6 @@
int depth;
Window video_win;
int vid_w, vid_h;
- enum video_modes video_mode;
double display_ratio;
int marks[10];
@@ -186,17 +188,14 @@
char *text[5];
} subtitle_t;
-GtkWidget *sinek_init(void);
+void sinek_init(void);
int control_build(GtkWidget **win);
void control_update_slider(unsigned long cur, unsigned long total);
void control_volume(int value);
-void control_mrl(char *mrl);
+void control_mrl(const char *mrl);
-void video_show(void);
-void video_hide(void);
-int video_play(char *mrl);
-void video_seek(int secs);
+int video_play(const char *mrl);
void video_toggle_fullscreen(void);
void video_lift(GtkWidget *win);
void video_scale(float factor);
@@ -267,10 +266,6 @@
subtitle_t *subtitle_find(unsigned long msec);
void subtitle_delete(void);
int subtitle_build(GtkWidget **win);
-
-void scrsaver_init(void);
-void scrsaver_enable(void);
-void scrsaver_disable(void);
#ifdef USE_GUILE
void guile_init(void);
Index: gtkxine.h
===================================================================
RCS file: /cvsroot/sinek/sinek/include/gtkxine.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gtkxine.h 19 Jan 2003 08:35:34 -0000 1.8
+++ gtkxine.h 17 Feb 2003 08:25:59 -0000 1.9
@@ -29,24 +29,40 @@
typedef struct _GtkXineClass GtkXineClass;
typedef enum _GtkXineConfigType GtkXineConfigType;
typedef enum _GtkXineStatus GtkXineStatus;
-typedef enum _GtkXinePlaybackSpeed GtkXinePlaybackSpeed;
-typedef enum _GtkXineVisualType GtkXineVisualType;
typedef enum _GtkXineAspectRatio GtkXineAspectRatio;
typedef enum _GtkXinePalette GtkXinePalette;
typedef enum _GtkXineEventType GtkXineEventType;
typedef struct _GtkXineEvent GtkXineEvent;
typedef enum _GtkXineVersion GtkXineVersion;
+struct _GtkXine
+{
+ GtkDrawingArea parent;
+
+ /* private */
+ xine_t *xine;
+ xine_audio_port_t *ao_driver;
+ xine_video_port_t *vo_driver;
+ xine_stream_t *stream;
+ xine_event_queue_t *event_queue;
+ xine_osd_t *osd;
+
+ void *video_driver_data;
+
+ /* properties */
+ gchar *mrl;
+ gchar *video_driver;
+ gchar *audio_driver;
+ gchar *conf;
+};
+
struct _GtkXineClass
{
- GtkWidgetClass parent;
-
- void (*reserved1) (void);
- void (*reserved2) (void);
- void (*reserved3) (void);
- void (*reserved4) (void);
+ GtkDrawingAreaClass parent;
};
+/* properties */
+
enum _GtkXineStatus
{
GTK_XINE_STATUS_IDLE = XINE_STATUS_IDLE,
@@ -66,15 +82,16 @@
GTK_XINE_CONFIG_TYPE_BOOL,
};
-enum _GtkXinePlaybackSpeed
+typedef enum
{
- GTK_XINE_PLAYBACK_SPEED_PAUSE = XINE_SPEED_PAUSE,
- GTK_XINE_PLAYBACK_SPEED_QUARTER_SLOW = XINE_SPEED_SLOW_4,
- GTK_XINE_PLAYBACK_SPEED_HALF_SLOW = XINE_SPEED_SLOW_2,
- GTK_XINE_PLAYBACK_SPEED_NORMAL = XINE_SPEED_NORMAL,
- GTK_XINE_PLAYBACK_SPEED_TWICE_FAST = XINE_SPEED_FAST_2,
- GTK_XINE_PLAYBACK_SPEED_FOUR_FAST = XINE_SPEED_FAST_4,
-};
+ GTK_XINE_SPEED_PAUSE = XINE_SPEED_PAUSE,
+ GTK_XINE_SPEED_SLOW_4 = XINE_SPEED_SLOW_4,
+ GTK_XINE_SPEED_SLOW_2 = XINE_SPEED_SLOW_2,
+ GTK_XINE_SPEED_NORMAL = XINE_SPEED_NORMAL,
+ GTK_XINE_SPEED_FAST_2 = XINE_SPEED_FAST_2,
+ GTK_XINE_SPEED_FAST_4 = XINE_SPEED_FAST_4,
+ GTK_XINE_SPEED_STOP
+} GtkXineSpeed;
enum _GtkXineAspectRatio
{
@@ -146,20 +163,6 @@
GTK_XINE_EVENT_NUMBER_10_ADD = XINE_EVENT_INPUT_NUMBER_10_ADD,
};
-#if 0
-// for now, only support X11
-enum _GtkXineVisualType
-{
- GTK_XINE_VISUAL_TYPE_NONE,
- GTK_XINE_VISUAL_TYPE_X11, /* you'll most likely want this */
- GTK_XINE_VISUAL_TYPE_AA,
- GTK_XINE_VISUAL_TYPE_FB,
- GTK_XINE_VISUAL_TYPE_GTK,
- GTK_XINE_VISUAL_TYPE_DFB,
- GTK_XINE_VISUAL_TYPE_PM,
-};
-#endif
-
struct _GtkXineEvent
{
GtkXineEventType type;
@@ -180,17 +183,10 @@
*/
typedef void (*gtk_xine_event_cb) (void *user_data, const GtkXineEvent *event);
-GtkType gtk_xine_get_type (void);
-GtkWidget* gtk_xine_new (void);
-
-const char *gtk_xine_set_audio_driver (GtkXine *xine, const char *name);
-const char *gtk_xine_set_video_driver (GtkXine *xine, const char *name, GtkWidget *videowin);
-/*const char *gtk_xine_set_fb_video_driver (GtkXine *xine, const char *name);*/
-
-/* config file */
+GType gtk_xine_get_type (void);
+GtkWidget* gtk_xine_new (const char *conffile);
-int gtk_xine_config_load (GtkXine *xine, const char *conffile);
-int gtk_xine_config_save (GtkXine *xine, const char *conffile);
+/* config (deprecated, glib has much better alternatives) */
const char *gtk_xine_config_register_string (GtkXine *xine, const char *key, const char *default_value);
int gtk_xine_config_register_range (GtkXine *xine, const char *key, int default_value, int min, int max);
@@ -207,32 +203,51 @@
/* media handling */
-int gtk_xine_load (GtkXine *xine, const char *mrl);
-const char* gtk_xine_get_current_mrl (GtkXine *xine);
-int gtk_xine_play (GtkXine *xine);
-int gtk_xine_play_from_position (GtkXine *xine, int start);
-int gtk_xine_play_from_time (GtkXine *xine, time_t start);
-int gtk_xine_stop (GtkXine *xine);
-
GtkXineStatus gtk_xine_get_status (GtkXine *xine);
void gtk_xine_event_listener (GtkXine *xine, gtk_xine_event_cb event_cb, void *user_data);
void gtk_xine_event_send (GtkXine *xine, GtkXineEventType type, void *user_data);
-uint32_t gtk_xine_stream_has_audio (GtkXine *xine);
-uint32_t gtk_xine_stream_has_video (GtkXine *xine);
+/* properties */
-/* stream parameters */
+const char *gtk_xine_get_mrl (GtkXine *xine);
+GtkXineSpeed gtk_xine_get_speed (GtkXine *xine);
+int gtk_xine_get_position (GtkXine *xine);
+int gtk_xine_get_time (GtkXine *xine);
+int gtk_xine_get_length (GtkXine *xine);
-GtkXinePlaybackSpeed gtk_xine_set_speed (GtkXine *xine, GtkXinePlaybackSpeed speed);
-GtkXinePlaybackSpeed gtk_xine_get_speed (GtkXine *xine);
+const char *gtk_xine_get_video_driver (GtkXine *xine);
+int gtk_xine_get_spu_channel (GtkXine *xine);
+gboolean gtk_xine_get_has_video (GtkXine *xine);
-int gtk_xine_set_av_offset (GtkXine *xine, int avoffset);
-int gtk_xine_get_av_offset (GtkXine *xine);
-int gtk_xine_set_audio_channel (GtkXine *xine, int channel);
+const char *gtk_xine_get_audio_driver (GtkXine *xine);
int gtk_xine_get_audio_channel (GtkXine *xine);
+int gtk_xine_get_volume (GtkXine *xine);
+gboolean gtk_xine_get_mute (GtkXine *xine);
+gboolean gtk_xine_get_has_audio (GtkXine *xine);
+
+const char *gtk_xine_get_conf (GtkXine *xine);
+int gtk_xine_get_version_major (GtkXine *xine);
+int gtk_xine_get_version_minor (GtkXine *xine);
+int gtk_xine_get_version_sub (GtkXine *xine);
+
+int gtk_xine_set_mrl (GtkXine *xine, const char *mrl);
+int gtk_xine_set_speed (GtkXine *xine, GtkXineSpeed speed);
+int gtk_xine_set_position (GtkXine *xine, int position);
+int gtk_xine_set_time (GtkXine *xine, int time);
+
+int gtk_xine_set_video_driver (GtkXine *xine, const char *driver);
int gtk_xine_set_spu_channel (GtkXine *xine, int channel);
-int gtk_xine_get_spu_channel (GtkXine *xine);
+
+int gtk_xine_set_audio_driver (GtkXine *xine, const char *driver);
+int gtk_xine_set_audio_channel (GtkXine *xine, int channel);
+int gtk_xine_set_volume (GtkXine *xine, int volume);
+int gtk_xine_set_mute (GtkXine *xine, gboolean mute);
+
+/* stream parameters */
+
+int gtk_xine_set_av_offset (GtkXine *xine, int avoffset);
+int gtk_xine_get_av_offset (GtkXine *xine);
int gtk_xine_set_video_channel (GtkXine *xine, int channel);
int gtk_xine_get_video_channel (GtkXine *xine);
int gtk_xine_set_video_contrast (GtkXine *xine, int contrast);
@@ -250,13 +265,8 @@
int gtk_xine_get_video_win_size (GtkXine *xine, int *x, int *y, int *width, int *height);
-int gtk_xine_set_volume (GtkXine *xine, int volume);
-int gtk_xine_get_volume (GtkXine *xine);
#define gtk_xine_adjust_volume(x, l) gtk_xine_set_volume ((x), gtk_xine_get_volume ((x)) + l)
-int gtk_xine_set_mute (GtkXine *xine, int muted);
-int gtk_xine_get_mute (GtkXine *xine);
-
GtkXineAspectRatio gtk_xine_set_aspect_ratio (GtkXine *xine, GtkXineAspectRatio ratio);
GtkXineAspectRatio gtk_xine_get_aspect_ratio (GtkXine *xine);
@@ -264,24 +274,14 @@
int gtk_xine_get_deinterlace (GtkXine *xine);
int gtk_xine_set_tvmode (GtkXine *xine, int tvmode);
int gtk_xine_get_tvmode (GtkXine *xine);
-int gtk_xine_set_fullscreen (GtkXine *xine, int fullscreen);
-int gtk_xine_get_fullscreen (GtkXine *xine);
/* XXX: get_{audio,spu}_lang */
-int gtk_xine_get_current_position (GtkXine *xine);
-time_t gtk_xine_get_current_time (GtkXine *xine);
-time_t gtk_xine_get_stream_length (GtkXine *xine);
-
void gtk_xine_eject (GtkXine *xine);
int gtk_xine_is_seekable (GtkXine *xine);
void gtk_xine_send_videowin_visible (GtkXine *xine, int visible);
-int gtk_xine_get_major_version (GtkXine *xine);
-int gtk_xine_get_minor_version (GtkXine *xine);
-int gtk_xine_get_sub_version (GtkXine *xine);
-
int gtk_xine_osd_reset (GtkXine *xine, int x, int y, int width, int height, const char *font, int font_size, GtkXinePalette palette);
int gtk_xine_osd_set_position (GtkXine *xine, int x, int y);
@@ -296,8 +296,17 @@
char** gtk_xine_get_autoplay_input_plugin_ids (GtkXine *xine);
char** gtk_xine_get_autoplay_mrls (GtkXine *xine, const char *id, int *count);
+/**
+ * Deprecated.
+ */
+
+static inline void gtk_xine_config_save (GtkXine *xine)
+{
+ xine_config_save (xine->xine, xine->conf);
+}
+
#ifdef __cplusplus
}
-#endif
+#endif /* __cplusplus */
-#endif
+#endif /* GTK_XINE_H */
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf