[MPlayer-cvslog] r31421 - in trunk: cfg-common-opts.h cfg-common_template.c cfg-mencoder.h cfg-mplayer.h

[diego]

Author: diego
Date: Mon Jun 14 19:17:04 2010
New Revision: 31421

Log:
Rename cfg-common-opts.h --> cfg-common_template.c.
This should make it crystal-clear that it is not a header file which
can be #included from anywhere without any sideeffects.  Similar files
in MPlayer and FFmpeg follow the same naming scheme.

Added:
   trunk/cfg-common_template.c
      - copied, changed from r31420, trunk/cfg-common-opts.h
Deleted:
   trunk/cfg-common-opts.h
Modified:
   trunk/cfg-mencoder.h
   trunk/cfg-mplayer.h

Copied and modified: trunk/cfg-common_template.c (from r31420, trunk/cfg-common-opts.h)
==============================================================================
--- trunk/cfg-common-opts.h	Mon Jun 14 17:50:07 2010	(r31420, copy source)
+++ trunk/cfg-common_template.c	Mon Jun 14 19:17:04 2010	(r31421)
@@ -16,9 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPLAYER_CFG_COMMON_OPTS_H
-#define MPLAYER_CFG_COMMON_OPTS_H
-
 // you may _not_ include any files here since this is included
 // in the middle of an array declaration
 
@@ -366,5 +363,3 @@
     {"fontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
     {"nofontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_FONTCONFIG */
-
-#endif /* MPLAYER_CFG_COMMON_OPTS_H */

Modified: trunk/cfg-mencoder.h
==============================================================================
--- trunk/cfg-mencoder.h	Mon Jun 14 17:50:07 2010	(r31420)
+++ trunk/cfg-mencoder.h	Mon Jun 14 19:17:04 2010	(r31421)
@@ -273,7 +273,7 @@ const m_option_t mencoder_opts[]={
     {"lavfopts",  lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
 
-#include "cfg-common-opts.h"
+#include "cfg-common_template.c"
 
 //   {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 //   {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Mon Jun 14 17:50:07 2010	(r31420)
+++ trunk/cfg-mplayer.h	Mon Jun 14 19:17:04 2010	(r31421)
@@ -369,7 +369,7 @@ const m_option_t mplayer_opts[]={
     {"tvscan", "MPlayer was compiled without TV interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 #endif /* CONFIG_TV */
 
-#include "cfg-common-opts.h"
+#include "cfg-common_template.c"
 
     {"list-properties", &list_properties, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
     {"identify", &mp_msg_levels[MSGT_IDENTIFY], CONF_TYPE_FLAG, CONF_GLOBAL, 0, MSGL_V, NULL},