sinek/src gtkxine.c,1.9,1.10 main.c,1.23,1.24 osd.c,1.19,1.20 popup.c,1.31,1.32 prefs.c,1.26,1.27 scrsaver.c,1.6,1.7 sinek.c,1.10,1.11 tune.c,1.14,1.15 video.c,1.29,1.30
[email protected] Sun, 19 Jan 2003 00:35:37 -0800
| Newsgroups | gmane.comp.video.sinek.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/sinek/sinek/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16716/src
Modified Files:
gtkxine.c main.c osd.c popup.c prefs.c scrsaver.c sinek.c
tune.c video.c
Log Message:
get rid of compile warnings
Index: gtkxine.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/gtkxine.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gtkxine.c 19 Jan 2003 06:18:23 -0000 1.9
+++ gtkxine.c 19 Jan 2003 08:35:35 -0000 1.10
@@ -290,7 +290,7 @@
return 0;
}
-int gtk_xine_config_get_enums (GtkXine *xine, const char *key, const char ***enums)
+int gtk_xine_config_get_enums (GtkXine *xine, const char *key, char ***enums)
{
xine_cfg_entry_t entry;
@@ -613,7 +613,7 @@
xine_event_queue_t *eventq;
eventq = xine_event_new_queue (xine->stream);
- xine_event_create_listener_thread (eventq, event_cb, user_data);
+ xine_event_create_listener_thread (eventq, (xine_event_listener_cb_t) event_cb, user_data);
/* XXX: dispose of queue, or keep it around for multiple regs? */
}
@@ -843,7 +843,7 @@
int gtk_xine_set_fullscreen (GtkXine *xine, int fullscreen)
{
if (fullscreen)
- gtk_window_fullscreen (GDK_WINDOW (xine->window));
+ gdk_window_fullscreen (GDK_WINDOW (xine->window));
else
gdk_window_unfullscreen (GDK_WINDOW (xine->window));
@@ -1009,12 +1009,12 @@
char **gtk_xine_get_autoplay_input_plugin_ids (GtkXine *xine)
{
- return xine_get_autoplay_input_plugin_ids (xine->xine);
+ return (char **) xine_get_autoplay_input_plugin_ids (xine->xine);
}
char **gtk_xine_get_autoplay_mrls (GtkXine *xine, const char *id, int *count)
{
- return xine_get_autoplay_mrls (xine->xine, id, count);
+ return (char **) xine_get_autoplay_mrls (xine->xine, id, count);
}
#ifdef GTK_XINE_TEST
Index: main.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- main.c 15 Jan 2003 07:23:43 -0000 1.23
+++ main.c 19 Jan 2003 08:35:35 -0000 1.24
@@ -126,13 +126,8 @@
return TRUE;
}
-
static void event_listener(void *this, const GtkXineEvent *event)
{
- switch(event->type)
- {
- case GTK_XINE_EVENT_TYPE_PLAYBACK_FINISHED:
- if(!stream_finished) stream_finished = 1;
- break;
- }
+ if (event->type == GTK_XINE_EVENT_TYPE_PLAYBACK_FINISHED)
+ stream_finished = 1;
}
Index: osd.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/osd.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- osd.c 17 Jan 2003 07:39:06 -0000 1.19
+++ osd.c 19 Jan 2003 08:35:35 -0000 1.20
@@ -12,7 +12,7 @@
#include "gtkxine.h"
static char *font = NULL;
-static int osd_h, osd_w, osd_x, osd_y, osd_pos;
+static int osd_h, /*osd_w,*/ osd_x, osd_y, osd_pos;
static char *placetext[] =
{
@@ -53,7 +53,7 @@
void osd_display(char **text)
{
- int i, j, tw = 0, th = 0, len;
+ /* int i, j, tw = 0, th = 0, len; */
if (font) {
/* recently changed, reset */
Index: popup.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/popup.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- popup.c 17 Jan 2003 07:47:25 -0000 1.31
+++ popup.c 19 Jan 2003 08:35:35 -0000 1.32
@@ -68,7 +68,7 @@
};
GtkItemFactory *fabrika;
gint n = sizeof(menus) / sizeof(menus[0]);
- const char *const *ids;
+ char **ids;
fabrika = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
gtk_item_factory_create_items(fabrika, n, menus, NULL);
Index: prefs.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/prefs.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- prefs.c 19 Jan 2003 06:18:23 -0000 1.26
+++ prefs.c 19 Jan 2003 08:35:35 -0000 1.27
@@ -249,7 +249,7 @@
item = g_list_first(((struct cfgitem *)page->data)->subitems);
while(item)
{
- void *val;
+ void *val = NULL;
citem = (struct cfgitem *)item->data;
switch (gtk_xine_config_get(GTK_XINE(sinek.xine), citem->label, val))
{
@@ -266,7 +266,7 @@
val = (void *) gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(citem->widget));
break;
case XINE_CONFIG_TYPE_RANGE:
- val = (int) GTK_ADJUSTMENT(citem->widget)->value; /* This drops precision, but gcc doesn't like casting from double->void* */
+ val = (void *) ((int) GTK_ADJUSTMENT(citem->widget)->value); /* This drops precision, but gcc doesn't like casting from double->void* */
break;
default:
break;
@@ -335,7 +335,7 @@
static GtkWidget *build_option(struct cfgitem *citem)
{
GtkWidget *box, *opt, *m, *mi;
- const char **enums;
+ char **enums;
int i = 0;
box = gtk_hbox_new(FALSE, 5);
Index: scrsaver.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/scrsaver.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scrsaver.c 17 Jan 2003 08:49:37 -0000 1.6
+++ scrsaver.c 19 Jan 2003 08:35:35 -0000 1.7
@@ -12,24 +12,26 @@
#include <X11/extensions/XTest.h>
#include <X11/keysym.h>
+#if 0
static int disabled;
static int timeout, interval, prefer_blanking, allow_exposures;
+#endif
#ifdef HAVE_XTEST
+#if 0
static int keycode;
static Bool xtest;
static gboolean fake_event(gpointer data)
{
-#if 0
if(disabled)
{
XTestFakeKeyEvent(sinek.display, keycode, True, CurrentTime);
XTestFakeKeyEvent(sinek.display, keycode, False, CurrentTime);
}
-#endif
return TRUE;
}
+#endif
#endif
Index: sinek.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/sinek.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sinek.c 19 Jan 2003 06:18:23 -0000 1.10
+++ sinek.c 19 Jan 2003 08:35:35 -0000 1.11
@@ -30,7 +30,7 @@
/* audio stuff */
audio = gtk_xine_config_register_string(xine, "audio.driver", "auto");
audio = gtk_xine_set_audio_driver(xine, audio);
- gtk_xine_config_set(xine, "audio.driver", audio);
+ gtk_xine_config_set(xine, "audio.driver", (void *) audio);
/* video stuff */
videoframe = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -41,7 +41,7 @@
video = gtk_xine_config_register_string(xine, "video.driver", "auto");
video = gtk_xine_set_video_driver(xine, video, videowin);
- gtk_xine_config_set(xine, "video.driver", video);
+ gtk_xine_config_set(xine, "video.driver", (void *) video);
/* post audio/video init stuff */
gtk_xine_load(xine, NULL);
Index: tune.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/tune.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tune.c 19 Jan 2003 05:30:39 -0000 1.14
+++ tune.c 19 Jan 2003 08:35:35 -0000 1.15
@@ -117,6 +117,8 @@
case PROP_CON:
cur = gtk_xine_get_video_contrast(GTK_XINE(sinek.xine));
break;
+ default:
+ cur = 0;
}
//media->vd->get_property_min_max(media->vd, prop, &min, &max);
adj = gtk_adjustment_new(cur, 0, 100, 1, 0, 0);
Index: video.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/video.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- video.c 19 Jan 2003 07:26:25 -0000 1.29
+++ video.c 19 Jan 2003 08:35:35 -0000 1.30
@@ -30,26 +30,8 @@
} MWMHints;
static int video_visible = 42;
-static XClassHint *xc_hint;
-// static XWMHints *wm_hint;
-static XSizeHints xs_hint;
-static Atom wm_delete_window;
-static int depth;
-static Visual *visual;
-static Window videowin;
-static Display *display;
-static int screen;
-static XColor black;
-static Colormap colormap = 0;
-static int xfred;
-static Cursor cursor[2];
-static void create_bg_window(void);
-static void find_best_visual(void);
int translate_point(int x, int y, int *vid_x, int *vid_y);
-static void create_window(int fs, int w, int h);
-static gboolean handle_event(GIOChannel *gio, GIOCondition cond, gpointer data);
-static GIOChannel *lala;
void video_show(void)
{
-------------------------------------------------------
This SF.NET email is sponsored by: Thawte.com - A 128-bit supercerts will
allow you to extend the highest allowed 128 bit encryption to all your
clients even if they use browsers that are limited to 40 bit encryption.
Get a guide here:http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0030en