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.

Makefile

@@ -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

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"

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"

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

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)
 {

sub/sub.c

@@ -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"