summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-20 23:38:27 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-20 23:38:27 +0000
commit70c66c04764421ca277c341657c556cb0f00ec9b (patch)
tree69bf77427ae7fe9c31a51842b78e65d2a41b3177
parenta06a3d476d268f9e17769916ebabf684af95e5e4 (diff)
downloadmpv-70c66c04764421ca277c341657c556cb0f00ec9b.tar.bz2
mpv-70c66c04764421ca277c341657c556cb0f00ec9b.tar.xz
Rename get_path.[ch] --> path.[ch].
These files now contain different functions related to path handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile2
-rw-r--r--command.c2
-rw-r--r--gui/cfg.c2
-rw-r--r--gui/interface.c2
-rw-r--r--gui/win32/dialogs.c2
-rw-r--r--gui/win32/interface.c2
-rw-r--r--gui/win32/wincfg.c2
-rw-r--r--input/input.c2
-rw-r--r--libaf/af_export.c2
-rw-r--r--libass/ass_mp.c2
-rw-r--r--libmpcodecs/vd_xanim.c2
-rw-r--r--libvo/font_load_ft.c2
-rw-r--r--libvo/vo_dxr2.c2
-rw-r--r--loader/drv.c2
-rw-r--r--loader/elfdll.c2
-rw-r--r--loader/module.c2
-rw-r--r--loader/registry.c2
-rw-r--r--loader/win32.c2
-rw-r--r--mencoder.c2
-rw-r--r--mplayer.c2
-rw-r--r--path.c (renamed from get_path.c)2
-rw-r--r--path.h (renamed from get_path.h)6
-rw-r--r--stream/stream_dvb.c2
23 files changed, 25 insertions, 25 deletions
diff --git a/Makefile b/Makefile
index b698bf6289..4773345028 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \
diff --git a/command.c b/command.c
index cd9d2abf5d..a62e0bb77f 100644
--- a/command.c
+++ b/command.c
@@ -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"
diff --git a/gui/cfg.c b/gui/cfg.c
index 3d564b4200..492a2d191d 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -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"
diff --git a/gui/interface.c b/gui/interface.c
index 8040f5c92c..17f6183033 100644
--- a/gui/interface.c
+++ b/gui/interface.c
@@ -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"
diff --git a/gui/win32/dialogs.c b/gui/win32/dialogs.c
index edd63d570c..bd0ac56793 100644
--- a/gui/win32/dialogs.c
+++ b/gui/win32/dialogs.c
@@ -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"
diff --git a/gui/win32/interface.c b/gui/win32/interface.c
index 5fbaa1ed64..6c4f07200e 100644
--- a/gui/win32/interface.c
+++ b/gui/win32/interface.c
@@ -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"
diff --git a/gui/win32/wincfg.c b/gui/win32/wincfg.c
index 33d5ae9fd6..539b7402cf 100644
--- a/gui/win32/wincfg.c
+++ b/gui/win32/wincfg.c
@@ -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"
diff --git a/input/input.c b/input/input.c
index 59afa23501..c0adf35428 100644
--- a/input/input.c
+++ b/input/input.c
@@ -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"
diff --git a/libaf/af_export.c b/libaf/af_export.c
index 949f3f18ca..e3eb917fc7 100644
--- a/libaf/af_export.c
+++ b/libaf/af_export.c
@@ -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
diff --git a/libass/ass_mp.c b/libass/ass_mp.c
index 2da7cbca03..4f1ff60204 100644
--- a/libass/ass_mp.c
+++ b/libass/ass_mp.c
@@ -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"
diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c
index 66fbb95175..70f9306ba3 100644
--- a/libmpcodecs/vd_xanim.c
+++ b/libmpcodecs/vd_xanim.c
@@ -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"
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
index 49c1c764c7..87249f5962 100644
--- a/libvo/font_load_ft.c
+++ b/libvo/font_load_ft.c
@@ -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)
diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c
index 0e1ac2fc35..28fd7a86bb 100644
--- a/libvo/vo_dxr2.c
+++ b/libvo/vo_dxr2.c
@@ -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"
diff --git a/loader/drv.c b/loader/drv.c
index ece4aa3456..fbc4007734 100644
--- a/loader/drv.c
+++ b/loader/drv.c
@@ -25,7 +25,7 @@
#ifndef __MINGW32__
#include "ext.h"
#endif
-#include "get_path.h"
+#include "path.h"
#if 1
diff --git a/loader/elfdll.c b/loader/elfdll.c
index b0317bf91a..5c33d2bde9 100644
--- a/loader/elfdll.c
+++ b/loader/elfdll.c
@@ -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)
diff --git a/loader/module.c b/loader/module.c
index 0d4f8087ce..b6eebcf19d 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -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"
diff --git a/loader/registry.c b/loader/registry.c
index 9964eeb9ff..cab63ceb72 100644
--- a/loader/registry.c
+++ b/loader/registry.c
@@ -21,7 +21,7 @@
#include "ext.h"
#include "registry.h"
-#include "get_path.h"
+#include "path.h"
//#undef TRACE
//#define TRACE printf
diff --git a/loader/win32.c b/loader/win32.c
index 52a7b2c6c5..fe8b198944 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -49,7 +49,7 @@ for DLL to know too much about its environment.
#include "loader.h"
#include "com.h"
#include "ext.h"
-#include "get_path.h"
+#include "path.h"
#include <stdlib.h>
#include <assert.h>
diff --git a/mencoder.c b/mencoder.c
index dcddaa649a..8b8b76c0ba 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -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"
diff --git a/mplayer.c b/mplayer.c
index 3602a04e82..4c4f4d8f2e 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -148,7 +148,7 @@ static int cfg_include(m_option_t *conf, char *filename){
return m_config_parse_config_file(mconfig, filename);
}
-#include "get_path.h"
+#include "path.h"
//**************************************************************************//
//**************************************************************************//
diff --git a/get_path.c b/path.c
index 90d428a4df..495f292af9 100644
--- a/get_path.c
+++ b/path.c
@@ -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>
diff --git a/get_path.h b/path.h
index 6713762937..fe7c0c6c85 100644
--- a/get_path.h
+++ b/path.h
@@ -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 */
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 4a7efe2724..c380e83895 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#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"