# HG changeset patch
# User diego
# Date 1277049225 0
# Node ID 974cfaa54e8387b9956c100004edbbf3843da6cd
# Parent  2392ad3cec9c03cf65a0c0d2a474831a8ad98ab4
Add declarations for open.c externally used variables to stream.h.

diff -r 2392ad3cec9c -r 974cfaa54e83 cfg-common.h
--- a/cfg-common.h	Sun Jun 20 15:43:45 2010 +0000
+++ b/cfg-common.h	Sun Jun 20 15:53:45 2010 +0000
@@ -174,8 +174,6 @@
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
-extern char *cdrom_device;
-
 const m_option_t vivoopts_conf[]={
     {"version", &vivo_param_version, CONF_TYPE_INT, 0, 0, 0, NULL},
     /* audio options */
diff -r 2392ad3cec9c -r 974cfaa54e83 gui/interface.c
--- a/gui/interface.c	Sun Jun 20 15:43:45 2010 +0000
+++ b/gui/interface.c	Sun Jun 20 15:53:45 2010 +0000
@@ -355,7 +355,6 @@
 }
 
 extern int              stream_dump_type;
-extern int  		vcd_track;
 
 void guiLoadFont( void )
 {
diff -r 2392ad3cec9c -r 974cfaa54e83 gui/win32/interface.c
--- a/gui/win32/interface.c	Sun Jun 20 15:43:45 2010 +0000
+++ b/gui/win32/interface.c	Sun Jun 20 15:53:45 2010 +0000
@@ -49,7 +49,6 @@
 #include <cdio/cdio.h>
 #endif
 
-extern int vcd_track;
 int guiWinID = 0;
 
 char *skinName = NULL;
diff -r 2392ad3cec9c -r 974cfaa54e83 stream/stream.h
--- a/stream/stream.h	Sun Jun 20 15:43:45 2010 +0000
+++ b/stream/stream.h	Sun Jun 20 15:53:45 2010 +0000
@@ -333,8 +333,10 @@
 extern int dvd_chapter;
 extern int dvd_last_chapter;
 extern int dvd_angle;
+extern int vcd_track;
 
 extern char * audio_stream;
+extern char *cdrom_device;
 
 typedef struct {
  int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm