From 4caa3356b298116a03ac0509b80dd60eca4017cc Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 7 Jul 2013 20:55:14 +0200 Subject: Remove some leftovers from network removal stream_vstream.c in particular was actually dependent on the network code, and didn't compile anymore. Cleanup the protocol list in mpv.rst, and add some missing ones supported by libavformat to stream_lavf.c. --- stream/cdd.h | 4 -- stream/stream_lavf.c | 2 +- stream/stream_vstream.c | 177 ------------------------------------------------ 3 files changed, 1 insertion(+), 182 deletions(-) delete mode 100644 stream/stream_vstream.c (limited to 'stream') diff --git a/stream/cdd.h b/stream/cdd.h index 705fe47d2c..e44b2ae24a 100644 --- a/stream/cdd.h +++ b/stream/cdd.h @@ -53,8 +53,4 @@ cd_track_t* cd_info_get_track(cd_info_t *cd_info, unsigned int track_nb); void cd_info_debug(cd_info_t *cd_info); -int cdd_identify(const char *dev); -int cddb_resolve(const char *dev, char **xmcd_file); -cd_info_t* cddb_parse_xmcd(char *xmcd_file); - #endif /* MPLAYER_CDD_H */ diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index 9a5249db54..48d5e9d173 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -313,7 +313,7 @@ const stream_info_t stream_info_ffmpeg = { "", open_f, { "lavf", "ffmpeg", "rtmp", "rtsp", "http", "https", "mms", "mmst", "mmsh", - "mmshttp", "udp", "ftp", NULL }, + "mmshttp", "udp", "ftp", "rtp", "httpproxy", NULL }, NULL, 1 // Urls are an option string }; diff --git a/stream/stream_vstream.c b/stream/stream_vstream.c deleted file mode 100644 index 7b25ca3103..0000000000 --- a/stream/stream_vstream.c +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (C) Joey Parrish - * - * This file is part of MPlayer. - * - * MPlayer 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. - * - * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* - * If you have a tivo with the vstream server installed, (and most tivo - * hackers do,) then you can connect to it and stream ty files using - * this module. The url syntax is tivo://host/fsid or tivo://host/list - * to list the available recordings and their fsid's. - * This module depends on libvstream-client, which is available from - * http://armory.nicewarrior.org/projects/vstream-client . - * - */ - - -#include "config.h" - -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "core/mp_msg.h" -#include "stream.h" -#include "core/m_option.h" -#include "core/m_struct.h" -#include "tcp.h" - -#include - -void vstream_error(const char *format, ...) { - char buf[1024]; - va_list va; - va_start(va, format); - vsnprintf(buf, 1024, format, va); - va_end(va); - mp_msg(MSGT_STREAM, MSGL_ERR, "%s", buf); -} - -static struct stream_priv_s { - char* host; - char* fsid; -} stream_priv_dflts = { - NULL, - NULL -}; - -#define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) -/// URL definition -static const m_option_t stream_opts_fields[] = { - {"hostname", ST_OFF(host), CONF_TYPE_STRING, 0, 0 ,0, NULL}, - {"filename", ST_OFF(fsid), CONF_TYPE_STRING, 0, 0 ,0, NULL}, - { NULL, NULL, 0, 0, 0, 0, NULL } -}; - -static const struct m_struct_st stream_opts = { - "vstream", - sizeof(struct stream_priv_s), - &stream_priv_dflts, - stream_opts_fields -}; - -static int fill_buffer(stream_t *s, char* buffer, int max_len){ - struct stream_priv_s* p = (struct stream_priv_s*)s->priv; - int len = vstream_load_chunk(p->fsid, buffer, max_len, s->pos); - if (len <= 0) return 0; - return len; -} - -static int seek(stream_t *s,int64_t newpos) { - s->pos = newpos; - return 1; -} - -static int control(struct stream *s, int cmd, void *arg) { - return STREAM_UNSUPPORTED; -} - -static void close_s(struct stream *s) { -} - -static int open_s(stream_t *stream, int mode, void* opts, int* file_format) { - int f; - struct stream_priv_s* p = (struct stream_priv_s*)opts; - - if(mode != STREAM_READ) - return STREAM_UNSUPPORTED; - - if(!p->host) { - mp_msg(MSGT_OPEN, MSGL_ERR, "We need a host name (ex: tivo://hostname/fsid)\n"); - m_struct_free(&stream_opts, opts); - return STREAM_ERROR; - } - - if(!p->fsid || strlen(p->fsid) == 0) { - mp_msg(MSGT_OPEN, MSGL_ERR, "We need an fsid (ex: tivo://hostname/fsid)\n"); - m_struct_free(&stream_opts, opts); - return STREAM_ERROR; - } - - f = connect2Server(p->host, VSERVER_PORT, 1); - - if(f < 0) { - mp_msg(MSGT_OPEN, MSGL_ERR, "Connection to %s failed\n", p->host); - m_struct_free(&stream_opts, opts); - return STREAM_ERROR; - } - stream->fd = f; - - vstream_set_socket_fd(f); - - if (!strcmp(p->fsid, "list")) { - vstream_list_streams(0); - return STREAM_ERROR; - } else if (!strcmp(p->fsid, "llist")) { - vstream_list_streams(1); - return STREAM_ERROR; - } - - if (vstream_start()) { - mp_msg(MSGT_OPEN, MSGL_ERR, "Cryptic internal error #1\n"); - m_struct_free(&stream_opts, opts); - return STREAM_ERROR; - } - if (vstream_startstream(p->fsid)) { - mp_msg(MSGT_OPEN, MSGL_ERR, "Cryptic internal error #2\n"); - m_struct_free(&stream_opts, opts); - return STREAM_ERROR; - } - - stream->start_pos = 0; - stream->end_pos = vstream_streamsize(); - mp_msg(MSGT_OPEN, MSGL_DBG2, "Tivo stream size is %lld\n", - (long long)stream->end_pos); - - stream->priv = p; - stream->fill_buffer = fill_buffer; - stream->control = control; - stream->seek = seek; - stream->close = close_s; - stream->type = STREAMTYPE_VSTREAM; - - return STREAM_OK; -} - -const stream_info_t stream_info_vstream = { - "vstream client", - "vstream", - "Joey", - "", - open_s, - { "tivo", NULL }, - &stream_opts, - 1 // Url is an option string -}; -- cgit v1.2.3