[Toxine-cvs] CVS: toxine/src common.h,1.20,1.21 loader.c,1.6,1.7 main.c,1.21,1.22 utils.c,1.18,1.19

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

Update of /cvsroot/toxine/toxine/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21743

Modified Files:
	common.h loader.c main.c utils.c 
Log Message:
@@i see the prompt for the first time with 1.0 API, but it's enought for tonight

Index: common.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/common.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- common.h	17 Jan 2003 23:39:52 -0000	1.20
+++ common.h	17 Jan 2003 23:59:15 -0000	1.21
@@ -53,6 +53,7 @@
 #define XINE_INIT          0x000000001
 #define XINE_NEW           0x000000002
 #define XINE_OPEN          0x000000004
+#define XINE_STREAM        0x000000008
 
 #define toxine_free(x)     do {                                             \
                              if((x)) {                                      \

Index: loader.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/loader.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- loader.c	17 Jan 2003 23:39:53 -0000	1.6
+++ loader.c	17 Jan 2003 23:59:15 -0000	1.7
@@ -35,7 +35,7 @@
 
 extern int errno;
 
-/* #define LOCAL_BUILD 1 */
+#define LOCAL_BUILD 1
 #ifdef LOCAL_BUILD
 #undef TOXINE_PLUGINDIR
 #define TOXINE_PLUGINDIR "plugins/.libs"
@@ -116,6 +116,10 @@
       }
     }
     closedir(dir);
+  }
+  else {
+    fprintf(stderr, "Can't open plugin directory: '%s'\nGiving up.\n", TOXINE_PLUGINDIR);
+    exit(1);
   }
   
   tox->video.cur_plugin = NULL;

Index: main.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/main.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- main.c	17 Jan 2003 23:39:53 -0000	1.21
+++ main.c	17 Jan 2003 23:59:15 -0000	1.22
@@ -73,8 +73,19 @@
  * Display version/copyright banner.
  */
 static void toxine_show_version(void) {
+  int major, minor, sub;
+  
   printf("This is toxine - xine shell v%s\n"
 	 "(c) 2002 by Daniel Caujolle-Bert <f1...@us...>.\n", VERSION);
+  
+  printf("Built with xine library %d.%d.%d (%s)\n",
+	 XINE_MAJOR_VERSION, XINE_MINOR_VERSION, XINE_SUB_VERSION, XINE_VERSION);
+  
+  xine_get_version (&major, &minor, &sub);
+  
+  printf("Found xine library version: %d.%d.%d (%s).\n", 
+	 major, minor, sub, xine_get_version_string());
+
 }
 
 /*
@@ -147,11 +158,11 @@
   int  i;
 
   /* Check xine library version */
-  if(!xine_check_version(0, 9, 14)) {
+  if(!xine_check_version(1, 0, 0)) {
     int major, minor, sub;
 
     xine_get_version(&major, &minor, &sub);
-    fprintf(stderr, "Require xine library version 0.9.14, found %d.%d.%d.\n", major, minor, sub);
+    fprintf(stderr, "Require xine library version 1.0.0, found %d.%d.%d.\n", major, minor, sub);
     exit(1);
   }
 
@@ -161,6 +172,7 @@
   tox->command.line    = NULL;
   tox->command.command = NULL;
   tox->command.execute = 0;
+  tox->xine_state      = 0;
   tox->msg_fd          = -1;
   tox->playlist.cur    = -1;
   tox->playlist.loop   = 0;
@@ -273,8 +285,9 @@
   }
   
   tox->xine                = xine_new();
+  tox->xine_state          |= XINE_NEW;
+
   toxine_config_load(tox);
-  tox->xine_state          = 0;
   tox->running             = 1;
   tox->playlist.mmk        = NULL;
   tox->playlist.thread_num = 0;;

Index: utils.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/utils.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- utils.c	17 Jan 2003 23:39:56 -0000	1.18
+++ utils.c	17 Jan 2003 23:59:16 -0000	1.19
@@ -162,7 +162,7 @@
 void toxine_update_prompt(toxine_t *tox) {
   int i = 0, s = -1; 
 
-  if(tox->xine)
+  if(tox->xine_state & XINE_STREAM)
     s = xine_get_status(tox->stream);
   
   while(prompt_state[i].state != NULL) {