diff options
author | wm4 <wm4@nowhere> | 2013-06-27 18:20:59 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-06-28 15:40:28 +0200 |
commit | ac79eb733741d8d22bbd550be39fe63c28a575f9 (patch) | |
tree | a4eedb7a040fe5a47487a2ab7b1561dfb4dcf15d | |
parent | 1327eeb375064573d5b9b3657958614ab297c2b1 (diff) | |
download | mpv-ac79eb733741d8d22bbd550be39fe63c28a575f9.tar.bz2 mpv-ac79eb733741d8d22bbd550be39fe63c28a575f9.tar.xz |
core: rename mplayer.h and quvi.c
mplayer.h used to be used for much more stuff, but all what is left are
quvi related definitions. Rename quvi.c as well to make its purpose
clearer.
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | core/command.c | 2 | ||||
-rw-r--r-- | core/mplayer.c | 2 | ||||
-rw-r--r-- | core/resolve.h (renamed from core/mplayer.h) | 10 | ||||
-rw-r--r-- | core/resolve_quvi.c (renamed from core/quvi.c) | 2 | ||||
-rw-r--r-- | sub/sub.c | 1 |
6 files changed, 7 insertions, 12 deletions
@@ -107,7 +107,7 @@ SOURCES-$(GL_WAYLAND) += video/out/wayland_common.c \ SOURCES-$(JACK) += audio/out/ao_jack.c SOURCES-$(JOYSTICK) += core/input/joystick.c -SOURCES-$(LIBQUVI) += core/quvi.c +SOURCES-$(LIBQUVI) += core/resolve_quvi.c SOURCES-$(LIRC) += core/input/lirc.c SOURCES-$(OPENAL) += audio/out/ao_openal.c SOURCES-$(OSS) += audio/out/ao_oss.c diff --git a/core/command.c b/core/command.c index c39bb3c16d..11ee73ec57 100644 --- a/core/command.c +++ b/core/command.c @@ -31,7 +31,7 @@ #include "stream/stream.h" #include "demux/demux.h" #include "demux/stheader.h" -#include "mplayer.h" +#include "resolve.h" #include "playlist.h" #include "playlist_parser.h" #include "sub/sub.h" diff --git a/core/mplayer.c b/core/mplayer.c index 3cdd83021d..fa0723f022 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -68,7 +68,7 @@ #include "core/m_option.h" #include "core/m_config.h" -#include "core/mplayer.h" +#include "core/resolve.h" #include "core/m_property.h" #include "sub/find_subfiles.h" diff --git a/core/mplayer.h b/core/resolve.h index 825458b6f5..d991bf1a39 100644 --- a/core/mplayer.h +++ b/core/resolve.h @@ -16,12 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPLAYER_MPLAYER_H -#define MPLAYER_MPLAYER_H - -#include <stdlib.h> - -#include "core/mp_msg.h" +#ifndef MP_RESOLVE_H +#define MP_RESOLVE_H struct MPContext; struct MPOpts; @@ -33,4 +29,4 @@ struct mp_resolve_result { struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts); -#endif /* MPLAYER_MPLAYER_H */ +#endif diff --git a/core/quvi.c b/core/resolve_quvi.c index e300e2dd03..5870335811 100644 --- a/core/quvi.c +++ b/core/resolve_quvi.c @@ -21,7 +21,7 @@ #include "talloc.h" #include "core/mp_msg.h" #include "core/options.h" -#include "mplayer.h" +#include "resolve.h" struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts) { @@ -31,7 +31,6 @@ #include "talloc.h" #include "core/options.h" -#include "core/mplayer.h" #include "core/mp_msg.h" #include "sub.h" #include "dec_sub.h" |