summaryrefslogtreecommitdiffstats
path: root/quvi.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-05 17:02:04 +0100
committerwm4 <wm4@nowhere>2012-11-12 20:06:14 +0100
commitd4bdd0473d6f43132257c9fb3848d829755167a3 (patch)
tree8021c2f7da1841393c8c832105e20cd527826d6c /quvi.c
parentbd48deba77bd5582c5829d6fe73a7d2571088aba (diff)
downloadmpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.bz2
mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.xz
Rename directories, move files (step 1 of 2) (does not compile)
Tis drops the silly lib prefixes, and attempts to organize the tree in a more logical way. Make the top-level directory less cluttered as well. Renames the following directories: libaf -> audio/filter libao2 -> audio/out libvo -> video/out libmpdemux -> demux Split libmpcodecs: vf* -> video/filter vd*, dec_video.* -> video/decode mp_image*, img_format*, ... -> video/ ad*, dec_audio.* -> audio/decode libaf/format.* is moved to audio/ - this is similar to how mp_image.* is located in video/. Move most top-level .c/.h files to core. (talloc.c/.h is left on top- level, because it's external.) Park some of the more annoying files in compat/. Some of these are relicts from the time mplayer used ffmpeg internals. sub/ is not split, because it's too much of a mess (subtitle code is mixed with OSD display and rendering). Maybe the organization of core is not ideal: it mixes playback core (like mplayer.c) and utility helpers (like bstr.c/h). Should the need arise, the playback core will be moved somewhere else, while core contains all helper and common code.
Diffstat (limited to 'quvi.c')
-rw-r--r--quvi.c83
1 files changed, 0 insertions, 83 deletions
diff --git a/quvi.c b/quvi.c
deleted file mode 100644
index 7be5f39bea..0000000000
--- a/quvi.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * This file is part of mpv.
- *
- * mpv is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * mpv is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with mpv; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <quvi/quvi.h>
-
-#include "talloc.h"
-#include "mp_msg.h"
-#include "options.h"
-#include "mplayer.h"
-
-struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts)
-{
- QUVIcode rc;
-
- quvi_t q;
- rc = quvi_init(&q);
- if (rc != QUVI_OK)
- return NULL;
-
- // Don't try to use quvi on an URL that's not directly supported, since
- // quvi will do a network access anyway in order to check for HTTP
- // redirections etc.
- // The documentation says this will fail on "shortened" URLs.
- if (quvi_supported(q, (char *)url) != QUVI_OK) {
- quvi_close(&q);
- return NULL;
- }
-
- mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Checking URL...\n");
-
- // Can use quvi_query_formats() to get a list of formats like this:
- // "fmt05_240p|fmt18_360p|fmt34_360p|fmt35_480p|fmt43_360p|fmt44_480p"
- // (This example is youtube specific.)
- // That call requires an extra net access. quvi_next_media_url() doesn't
- // seem to do anything useful. So we can't really do anything useful
- // except pass through the user's format setting.
- quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format
- ? opts->quvi_format : "best");
-
- quvi_media_t m;
- rc = quvi_parse(q, (char *)url, &m);
- if (rc != QUVI_OK) {
- mp_msg(MSGT_OPEN, MSGL_ERR, "[quvi] %s\n", quvi_strerror(q, rc));
- quvi_close(&q);
- return NULL;
- }
-
- struct mp_resolve_result *result
- = talloc_zero(NULL, struct mp_resolve_result);
-
- char *val;
-
- if (quvi_getprop(m, QUVIPROP_MEDIAURL, &val) == QUVI_OK)
- result->url = talloc_strdup(result, val);
-
- if (quvi_getprop(m, QUVIPROP_PAGETITLE, &val) == QUVI_OK)
- result->title = talloc_strdup(result, val);
-
- quvi_parse_close(&m);
- quvi_close(&q);
-
- if (!result->url) {
- talloc_free(result);
- result = NULL;
- }
-
- return result;
-}