[MPlayer-cvslog] r30943 - in trunk: Makefile command.c get_path.c get_path.h gui/cfg.c gui/interface.c gui/win32/dialogs.c gui/win32/interface.c gui/win32/wincfg.c input/input.c libaf/af_export.c libass/ass_mp.c li...

Sun Mar 21 00:38:27 CET 2010

Author: diego
Date: Sun Mar 21 00:38:27 2010
New Revision: 30943

Log:
Rename get_path.[ch] --> path.[ch].
These files now contain different functions related to path handling.

Added:
   trunk/path.c
      - copied, changed from r30942, trunk/get_path.c
   trunk/path.h
      - copied, changed from r30942, trunk/get_path.h
Deleted:
   trunk/get_path.c
   trunk/get_path.h
Modified:
   trunk/Makefile
   trunk/command.c
   trunk/gui/cfg.c
   trunk/gui/interface.c
   trunk/gui/win32/dialogs.c
   trunk/gui/win32/interface.c
   trunk/gui/win32/wincfg.c
   trunk/input/input.c
   trunk/libaf/af_export.c
   trunk/libass/ass_mp.c
   trunk/libmpcodecs/vd_xanim.c
   trunk/libvo/font_load_ft.c
   trunk/libvo/vo_dxr2.c
   trunk/loader/drv.c
   trunk/loader/elfdll.c
   trunk/loader/module.c
   trunk/loader/registry.c
   trunk/loader/win32.c
   trunk/mencoder.c
   trunk/mplayer.c
   trunk/stream/stream_dvb.c

Modified: trunk/Makefile
==============================================================================

--- trunk/Makefile	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/Makefile	Sun Mar 21 00:38:27 2010	(r30943)
@@ -344,12 +344,12 @@ SRCS_COMMON = asxparser.c \
               edl.c \
               find_sub.c \
               fmt-conversion.c \
-              get_path.c \
               m_config.c \
               m_option.c \
               m_struct.c \
               mpcommon.c \
               parser-cfg.c \
+              path.c \
               playtree.c \
               playtreeparser.c \
               spudec.c \

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/command.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -46,7 +46,7 @@
 #include "libmpcodecs/dec_teletext.h"
 #include "vobsub.h"
 #include "spudec.h"
-#include "get_path.h"
+#include "path.h"
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
 #include "stream/pvr.h"

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/gui/cfg.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -27,7 +27,7 @@
 #include "mplayer.h"
 #include "m_config.h"
 #include "m_option.h"
-#include "get_path.h"
+#include "path.h"
 #include "libmpcodecs/vd.h"
 #include "libvo/sub.h"
 #include "libvo/video_out.h"

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/gui/interface.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -36,7 +36,7 @@
 #include "app.h"
 #include "cfg.h"
 #include "help_mp.h"
-#include "get_path.h"
+#include "path.h"
 #include "mp_core.h"
 #include "mplayer.h"
 #include "libmpcodecs/vd.h"

Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/gui/win32/dialogs.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -23,7 +23,7 @@
 
 #include <windows.h>
 #include <commctrl.h>
-#include <get_path.h>
+#include "path.h"
 #include "gui/interface.h"
 #include "mp_msg.h"
 #include "help_mp.h"

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/gui/win32/interface.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -22,7 +22,7 @@
  */
 
 #include <windows.h>
-#include <get_path.h>
+#include "path.h"
 #include "gui/interface.h"
 #include "m_option.h"
 #include "mixer.h"

Modified: trunk/gui/win32/wincfg.c
==============================================================================
--- trunk/gui/win32/wincfg.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/gui/win32/wincfg.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -24,7 +24,7 @@
 #include <windows.h>
 #include <stdlib.h>
 #include <string.h>
-#include <get_path.h>
+#include "path.h"
 #include "mplayer.h"
 #include "mp_msg.h"
 #include "help_mp.h"

Modified: trunk/input/input.c
==============================================================================
--- trunk/input/input.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/input/input.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -43,7 +43,7 @@
 #include "help_mp.h"
 #include "m_config.h"
 #include "m_option.h"
-#include "get_path.h"
+#include "path.h"
 
 #include "joystick.h"
 

Modified: trunk/libaf/af_export.c
==============================================================================
--- trunk/libaf/af_export.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/libaf/af_export.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -38,7 +38,7 @@
 #include <fcntl.h>
 
 #include "af.h"
-#include "get_path.h"
+#include "path.h"
 
 #define DEF_SZ 512 // default buffer size (in samples)
 #define SHARED_FILE "mplayer-af_export" /* default file name

Modified: trunk/libass/ass_mp.c
==============================================================================
--- trunk/libass/ass_mp.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/libass/ass_mp.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 #include "mp_msg.h"
-#include "get_path.h"
+#include "path.h"
 
 #include "ass_mp.h"
 #include "help_mp.h"

Modified: trunk/libmpcodecs/vd_xanim.c
==============================================================================
--- trunk/libmpcodecs/vd_xanim.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/libmpcodecs/vd_xanim.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -29,7 +29,7 @@
 #include <string.h> /* strerror */
 
 #include "config.h"
-#include "get_path.h"
+#include "path.h"
 #include "mp_msg.h"
 
 #include "vd_internal.h"

Modified: trunk/libvo/font_load_ft.c
==============================================================================
--- trunk/libvo/font_load_ft.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/libvo/font_load_ft.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -48,7 +48,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "mplayer.h"
-#include "get_path.h"
+#include "path.h"
 #include "osd_font.h"
 
 #if (FREETYPE_MAJOR > 2) || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 1)

Modified: trunk/libvo/vo_dxr2.c
==============================================================================
--- trunk/libvo/vo_dxr2.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/libvo/vo_dxr2.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -35,7 +35,7 @@
 #include "mp_msg.h"
 #include "m_option.h"
 #include "sub.h"
-#include "get_path.h"
+#include "path.h"
 #include "libmpdemux/mpeg_packetizer.h"
 #include "x11_common.h"
 

Modified: trunk/loader/drv.c
==============================================================================
--- trunk/loader/drv.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/loader/drv.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -25,7 +25,7 @@
 #ifndef __MINGW32__
 #include "ext.h"
 #endif
-#include "get_path.h"
+#include "path.h"
 
 #if 1
 

Modified: trunk/loader/elfdll.c
==============================================================================
--- trunk/loader/elfdll.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/loader/elfdll.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -18,7 +18,7 @@
 #include "wine/debugtools.h"
 #include "wine/winerror.h"
 #include "debug.h"
-#include "get_path.h"
+#include "path.h"
 
 //DEFAULT_DEBUG_CHANNEL(elfdll)
 

Modified: trunk/loader/module.c
==============================================================================
--- trunk/loader/module.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/loader/module.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -46,7 +46,7 @@
 #endif
 #include "win32.h"
 #include "drv.h"
-#include "get_path.h"
+#include "path.h"
 
 #ifdef EMU_QTX_API
 #include "wrapper.h"

Modified: trunk/loader/registry.c
==============================================================================
--- trunk/loader/registry.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/loader/registry.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -21,7 +21,7 @@
 #include "ext.h"
 #include "registry.h"
 
-#include "get_path.h"
+#include "path.h"
 
 //#undef TRACE
 //#define TRACE printf

Modified: trunk/loader/win32.c
==============================================================================
--- trunk/loader/win32.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/loader/win32.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -49,7 +49,7 @@ for DLL to know too much about its envir
 #include "loader.h"
 #include "com.h"
 #include "ext.h"
-#include "get_path.h"
+#include "path.h"
 
 #include <stdlib.h>
 #include <assert.h>

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/mencoder.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -63,7 +63,7 @@
 #include "parser-mecmd.h"
 #include "parser-cfg.h"
 #include "mp_fifo.h"
-#include "get_path.h"
+#include "path.h"
 
 #include "stream/stream.h"
 #include "libmpdemux/aviprint.h"

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/mplayer.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -148,7 +148,7 @@ static int cfg_include(m_option_t *conf,
 	return m_config_parse_config_file(mconfig, filename);
 }
 
-#include "get_path.h"
+#include "path.h"
 
 //**************************************************************************//
 //**************************************************************************//

Copied and modified: trunk/path.c (from r30942, trunk/get_path.c)
==============================================================================
--- trunk/get_path.c	Sun Mar 21 00:27:07 2010	(r30942, copy source)
+++ trunk/path.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -28,7 +28,7 @@
 #include <string.h>
 #include "config.h"
 #include "mp_msg.h"
-#include "get_path.h"
+#include "path.h"
 
 #ifdef CONFIG_MACOSX_BUNDLE
 #include <CoreFoundation/CoreFoundation.h>

Copied and modified: trunk/path.h (from r30942, trunk/get_path.h)
==============================================================================
--- trunk/get_path.h	Sun Mar 21 00:27:07 2010	(r30942, copy source)
+++ trunk/path.h	Sun Mar 21 00:38:27 2010	(r30943)
@@ -18,8 +18,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPLAYER_GET_PATH_H
-#define MPLAYER_GET_PATH_H
+#ifndef MPLAYER_PATH_H
+#define MPLAYER_PATH_H
 
 extern char *def_path;
 
@@ -27,4 +27,4 @@ char *get_path(const char *filename);
 void set_path_env(void);
 void SetCodecPath(const char *path);
 
-#endif /* MPLAYER_GET_PATH_H */
+#endif /* MPLAYER_PATH_H */

Modified: trunk/stream/stream_dvb.c
==============================================================================
--- trunk/stream/stream_dvb.c	Sun Mar 21 00:27:07 2010	(r30942)
+++ trunk/stream/stream_dvb.c	Sun Mar 21 00:38:27 2010	(r30943)
@@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fi
 #include "help_mp.h"
 #include "m_option.h"
 #include "m_struct.h"
-#include "get_path.h"
+#include "path.h"
 #include "libavutil/avstring.h"
 
 #include "dvbin.h"
