Move libquvi stuff to stream/resolve/

old-makefile

@@ -105,8 +105,8 @@ SOURCES-$(GL_WAYLAND)           += video/out/wayland_common.c \
 
 SOURCES-$(JACK)                 += audio/out/ao_jack.c
 SOURCES-$(JOYSTICK)             += input/joystick.c
-SOURCES-$(LIBQUVI)              += mpvcore/resolve_quvi.c
-SOURCES-$(LIBQUVI9)             += mpvcore/resolve_quvi9.c
+SOURCES-$(LIBQUVI)              += stream/resolve/resolve_quvi.c
+SOURCES-$(LIBQUVI9)             += stream/resolve/resolve_quvi9.c
 SOURCES-$(LIRC)                 += input/lirc.c
 SOURCES-$(OPENAL)               += audio/out/ao_openal.c
 SOURCES-$(OSS)                  += audio/out/ao_oss.c

player/command.c

@@ -37,7 +37,7 @@
 #include "stream/stream.h"
 #include "demux/demux.h"
 #include "demux/stheader.h"
-#include "mpvcore/resolve.h"
+#include "stream/resolve/resolve.h"
 #include "mpvcore/playlist.h"
 #include "mpvcore/playlist_parser.h"
 #include "sub/osd.h"

player/loadfile.c

@@ -38,7 +38,6 @@
 #include "mpvcore/options.h"
 #include "mpvcore/m_property.h"
 #include "mpvcore/mp_common.h"
-#include "mpvcore/resolve.h"
 #include "mpvcore/encode.h"
 #include "input/input.h"
 
@@ -49,6 +48,7 @@
 #include "audio/out/ao.h"
 #include "demux/demux.h"
 #include "stream/stream.h"
+#include "stream/resolve/resolve.h"
 #include "sub/ass_mp.h"
 #include "sub/dec_sub.h"
 #include "sub/find_subfiles.h"

player/main.c

@@ -42,7 +42,6 @@
 #include "mpvcore/mp_common.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mpv_global.h"
-#include "mpvcore/resolve.h"
 #include "mpvcore/parser-cfg.h"
 #include "mpvcore/parser-mpcmd.h"
 #include "mpvcore/playlist.h"

player/misc.c

@@ -30,7 +30,6 @@
 #include "mpvcore/options.h"
 #include "mpvcore/m_property.h"
 #include "mpvcore/mp_common.h"
-#include "mpvcore/resolve.h"
 #include "mpvcore/encode.h"
 #include "mpvcore/playlist.h"
 #include "input/input.h"

wscript_build.py

@@ -184,8 +184,6 @@ def build(ctx):
         ( "mpvcore/path.c" ),
         ( "mpvcore/playlist.c" ),
         ( "mpvcore/playlist_parser.c" ),
-        ( "mpvcore/resolve_quvi.c",              "libquvi4" ),
-        ( "mpvcore/resolve_quvi9.c",             "libquvi9" ),
         ( "mpvcore/version.c" ),
 
         ## Demuxers
@@ -260,6 +258,8 @@ def build(ctx):
         ( "stream/tv.c",                         "tv" ),
         ( "stream/tvi_dummy.c",                  "tv" ),
         ( "stream/tvi_v4l2.c",                   "tv-v4l2"),
+        ( "stream/resolve/resolve_quvi.c",       "libquvi4" ),
+        ( "stream/resolve/resolve_quvi9.c",      "libquvi9" ),
 
         ## Subtitles
         ( "sub/ass_mp.c",                        "libass"),