[MPlayer-cvslog] r31485 - in trunk: cfg-common.h stream/pvr.h

[diego]

Author: diego
Date: Sun Jun 20 17:15:37 2010
New Revision: 31485

Log:
Move pvr_ extern variable declarations to stream/pvr.h.

Modified:
   trunk/cfg-common.h
   trunk/stream/pvr.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Jun 20 17:04:12 2010	(r31484)
+++ trunk/cfg-common.h	Sun Jun 20 17:15:37 2010	(r31485)
@@ -38,6 +38,7 @@
 #include "libpostproc/postprocess.h"
 #include "osdep/priority.h"
 #include "stream/network.h"
+#include "stream/pvr.h"
 #include "stream/stream_dvd_common.h"
 #include "codec-cfg.h"
 
@@ -141,16 +142,6 @@ const m_option_t tvopts_conf[]={
 };
 #endif /* CONFIG_TV */
 
-extern int pvr_param_aspect_ratio;
-extern int pvr_param_sample_rate;
-extern int pvr_param_audio_layer;
-extern int pvr_param_audio_bitrate;
-extern char *pvr_param_audio_mode;
-extern int pvr_param_bitrate;
-extern char *pvr_param_bitrate_mode;
-extern int pvr_param_bitrate_peak;
-extern char *pvr_param_stream_type;
-
 #ifdef CONFIG_PVR
 const m_option_t pvropts_conf[]={
     {"aspect", &pvr_param_aspect_ratio, CONF_TYPE_INT, 0, 1, 4, NULL},

Modified: trunk/stream/pvr.h
==============================================================================
--- trunk/stream/pvr.h	Sun Jun 20 17:04:12 2010	(r31484)
+++ trunk/stream/pvr.h	Sun Jun 20 17:15:37 2010	(r31485)
@@ -30,6 +30,17 @@
 #include "stream.h"
 #include "tv.h"
 
+extern char *pvr_param_audio_mode;
+extern char *pvr_param_bitrate_mode;
+extern char *pvr_param_stream_type;
+
+extern int pvr_param_aspect_ratio;
+extern int pvr_param_audio_bitrate;
+extern int pvr_param_audio_layer;
+extern int pvr_param_bitrate;
+extern int pvr_param_bitrate_peak;
+extern int pvr_param_sample_rate;
+
 /**
  * @brief Get the current station name.
  *        The pointer is valid, till the stream is closed.