RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-18 21:06:00 +00:00
Code Issues Releases Wiki Activity

Implemented tv://[<channel>][/<input_id>] url syntax

Browse Source 
to allow users start watching from S-Video or Composite 
input without touching '-tv input=' option.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23687 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
voroshil 2007-06-28 18:36:05 +00:00
parent ad164e04ee
commit 6aea0fb430
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DOCS/man/en/mplayer.1
View File

@ -70,7 +70,7 @@ vcd://track[/device]
.
.br
.B mplayer
tv://[channel]
tv://[channel][/input_id]
[options]
.
.br
@ -1728,7 +1728,8 @@ Can be used with \-vid and \-aid.
This option tunes various properties of the TV capture module.
For watching TV with MPlayer, use 'tv://' or 'tv://<channel_number>'
or even 'tv://<channel_name> (see option channels for channel_name below)
as a movie URL.
as a movie URL. You can also use 'tv:///<input_id>' to start watching
movie from Composite or S-Video input (see option input for details).
.sp 1
Available options are:
.RSs

37
stream/stream_tv.c
View File

@ -24,17 +24,48 @@
#include "stream.h"
#include "libmpdemux/demuxer.h"
#include "m_option.h"
#include "m_struct.h"
#include <stdio.h>
static struct stream_priv_s {
/* if channels parameter exist here will be channel number otherwise - frequency */
int input;
char* channel;
} stream_priv_dflts = {
0,
NULL
};
#define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f)
static m_option_t stream_opts_fields[] = {
{"hostname", ST_OFF(channel), CONF_TYPE_STRING, 0, 0 ,0, NULL},
{"filename", ST_OFF(input), CONF_TYPE_INT, 0, 0 ,0, NULL},
{ NULL, NULL, 0, 0, 0, 0, NULL }
};
static struct m_struct_st stream_opts = {
"tv",
sizeof(struct stream_priv_s),
&stream_priv_dflts,
stream_opts_fields
};
static int
tv_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
{
extern char* tv_param_channel;
extern int tv_param_input;
struct stream_priv_s* p=(struct stream_priv_s*)opts;
stream->type = STREAMTYPE_TV;
*file_format = DEMUXER_TYPE_TV;
if (strlen (stream->url) > 5 && stream->url[5] != '\0')
tv_param_channel = strdup (stream->url + 5);
tv_param_input=p->input;
if (p->channel)
tv_param_channel=strdup (p->channel);
fprintf(stderr,"%p\n",p->channel) ;
return STREAM_OK;
}
@ -45,6 +76,6 @@ stream_info_t stream_info_tv = {
"",
tv_stream_open,
{ "tv", NULL },
NULL,
&stream_opts,
1
};

0
stream/tvi_vbi.c Normal file
View File