[Toxine-cvs] CVS: toxine/src/plugins Makefile.am,1.10,1.11 vo_aa.c,1.15,1.16 vo_caca.c,1.1,1.2 vo_dxr3.c,1.19,1.20 vo_none.c,1.12,1.13 vo_x11.c,1.29,1.30

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/toxine/toxine/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3177/src/plugins

Modified Files:
	Makefile.am vo_aa.c vo_caca.c vo_dxr3.c vo_none.c vo_x11.c 
Log Message:
release preparation

Index: Makefile.am
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am	9 Apr 2004 17:43:14 -0000	1.10
+++ Makefile.am	6 May 2004 19:18:34 -0000	1.11
@@ -22,10 +22,10 @@
 	-lX11 -lm -lXext $(X_EXTRA_LIBS)
 
 toxine_vo_plugin_aa_la_SOURCES = vo_aa.c
-toxine_vo_plugin_aa_la_LDFLAGS = -avoid-version -module $(AALIB_LIBS) -lm
+toxine_vo_plugin_aa_la_LDFLAGS = -avoid-version -module $(DYNAMIC_LD_LIBS) $(AALIB_LIBS) -lm
 
 toxine_vo_plugin_caca_la_SOURCES = vo_caca.c
-toxine_vo_plugin_caca_la_LDFLAGS = -avoid-version -module $(CACA_LIBS) -lm
+toxine_vo_plugin_caca_la_LDFLAGS = -avoid-version -module $(DYNAMIC_LD_LIBS) $(CACA_LIBS) -lm
 
 toxine_vo_plugin_dxr3_la_SOURCES = vo_dxr3.c
 toxine_vo_plugin_dxr3_la_LDFLAGS = -avoid-version -module

Index: vo_aa.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_aa.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vo_aa.c	9 Apr 2004 17:43:14 -0000	1.15
+++ vo_aa.c	6 May 2004 19:18:34 -0000	1.16
@@ -43,7 +43,7 @@
   aa_private_t       *private = (aa_private_t *) vop->private;
   
   private->init    = 1;
-
+  
   private->context = aa_autoinit(&aa_defparams);
   if(private->context == NULL) {
     fprintf(stderr,"Cannot initialize AA-lib. Sorry\n");
@@ -68,8 +68,7 @@
     exit(1);
   }
   else
-    fprintf(stderr, "video driver '%s' successfuly loaded.\n", tox->video.name);
-  
+    pinfo("video driver '%s' successfully loaded.\n", tox->video.name);
 }
 
 static void deinit_video_out(toxine_t *tox) {
@@ -86,6 +85,7 @@
     aa_flush(private->context);
     aa_close(private->context);
   }
+
 }
 
 static void release_video_out(toxine_t *tox) {

Index: vo_caca.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_caca.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vo_caca.c	9 Apr 2004 17:43:14 -0000	1.1
+++ vo_caca.c	6 May 2004 19:18:34 -0000	1.2
@@ -35,22 +35,55 @@
 
 typedef struct {
   int              init;
+  pthread_t        loop_thread;
 } caca_private_t;
 
+#if 0
+static void *caca_event_loop(void *data) {
+  toxine_t           *tox = (toxine_t *) data;
+  toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
+  caca_private_t     *private = (caca_private_t *) vop->private;
+  
+  while(tox->video.running) {
+    unsigned int event;
+    while((event = caca_get_event(CACA_EVENT_ANY))) {
+      
+      if(event == CACA_EVENT_NONE)
+	pinfo("NONE\n");
+      else if(event & CACA_EVENT_KEY_PRESS)
+	pinfo("KEYPRESS\n");
+      else if(event & CACA_EVENT_KEY_RELEASE)
+	pinfo("KEYRELEASE\n");
+      else if(event & CACA_EVENT_MOUSE_PRESS)
+	pinfo("MOUSE_PRESS\n");
+      else if(event & CACA_EVENT_MOUSE_RELEASE)
+	pinfo("MOUSERELEASE\n");
+      else if(event & CACA_EVENT_MOUSE_MOTION)
+	pinfo("MOUSEMOTION\n");
+      else if(event & CACA_EVENT_RESIZE)
+	pinfo("RESIZE\n");
+    }    
+    
+  }
+  pthread_exit(NULL);
+}
+#endif
+
 static void init_video_out(toxine_t *tox) {
   toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
   caca_private_t     *private = (caca_private_t *) vop->private;
   
   private->init   = 1;
+
   tox->video.port = xine_open_video_driver(tox->xine, tox->video.name, XINE_VISUAL_TYPE_CACA, NULL);
-  
+
   if(tox->video.port == NULL) {
     fprintf(stderr, "xine_open_video_driver() failed to load '%s' driver.\n",
 	    tox->video.name);
     exit(1);
   }
   else
-    fprintf(stderr, "video driver '%s' successfuly loaded.\n", tox->video.name);
+    pinfo("video driver '%s' successfully loaded.\n", tox->video.name);
   
 }
 
@@ -95,6 +128,23 @@
 static void fullscreen(toxine_t *tox) {
 }
 
+#if 0
+static void *event_loop(void *data) {
+  toxine_t           *tox = (toxine_t *) data;
+  toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
+  caca_private_t     *private = (caca_private_t *) vop->private;
+
+  pthread_detach(pthread_self());
+  
+  while(tox->video.running) {
+    caca_refresh();
+    xine_usec_sleep(33000);
+  }
+  
+  pthread_exit(NULL);
+}
+#endif
+
 toxine_vo_plugin_t *toxine_load_vo_plugin(toxine_t *tox) {
   toxine_vo_plugin_t *caca;
   caca_private_t     *private;
@@ -103,7 +153,7 @@
   private = (caca_private_t *) xine_xmalloc(sizeof(caca_private_t));
 
   private->init              = 0;
-  
+    
   caca->video_out_init       = init_video_out;
   caca->video_out_event_loop = NULL;
   caca->video_out_deinit     = deinit_video_out;
@@ -118,4 +168,3 @@
 
   return caca;
 }
-

Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_dxr3.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vo_dxr3.c	9 Apr 2004 17:43:14 -0000	1.19
+++ vo_dxr3.c	6 May 2004 19:18:34 -0000	1.20
@@ -73,7 +73,7 @@
     exit(1);
   }
   else
-    fprintf(stderr, "video driver '%s' successfuly loaded.\n", drivername);
+    pinfo("video driver '%s' successfully loaded.\n", drivername);
   
 }
 

Index: vo_none.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_none.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_none.c	9 Apr 2004 17:43:14 -0000	1.12
+++ vo_none.c	6 May 2004 19:18:34 -0000	1.13
@@ -44,7 +44,7 @@
     exit(1);
   }
   else
-    fprintf(stderr, "video driver '%s' successfuly loaded.\n", tox->video.name);
+    pinfo("video driver '%s' successfully loaded.\n", tox->video.name);
 
 }
 

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_x11.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- vo_x11.c	12 Apr 2004 12:45:14 -0000	1.29
+++ vo_x11.c	6 May 2004 19:18:34 -0000	1.30
@@ -745,7 +745,7 @@
       exit(1);
     }
     else
-      fprintf(stderr, "video driver '%s' successfuly loaded.\n", drivername);
+      pinfo("video driver '%s' successfully loaded.\n", drivername);
     
   }