RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-01 03:40:43 +00:00
Code Issues Releases Wiki Activity

add an explicit tv stream input instead of the previous hack in stream_null

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19279 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ben 2006-07-31 18:36:29 +00:00
parent 7690284b94
commit 1cad07f6cd
4 changed files with 56 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stream/Makefile
View File

@ -55,7 +55,7 @@ endif
# TV in
ifeq ($(TV),yes)
SRCS += tv.c frequencies.c tvi_dummy.c
SRCS += stream_tv.c tv.c frequencies.c tvi_dummy.c
ifeq ($(TV_BSDBT848),yes)
SRCS += tvi_bsdbt848.c
endif

6
stream/stream.c
View File

@ -54,6 +54,9 @@ extern stream_info_t stream_info_http2;
#ifdef HAS_DVBIN_SUPPORT
extern stream_info_t stream_info_dvb;
#endif
#ifdef USE_TV
extern stream_info_t stream_info_tv;
#endif
#ifdef HAVE_PVR
extern stream_info_t stream_info_pvr;
#endif
@ -104,6 +107,9 @@ stream_info_t* auto_open_streams[] = {
#ifdef HAS_DVBIN_SUPPORT
&stream_info_dvb,
#endif
#ifdef USE_TV
&stream_info_tv,
#endif
#ifdef HAVE_PVR
&stream_info_pvr,
#endif

15
stream/stream_null.c
View File

@ -7,24 +7,12 @@
#include "stream.h"
#include "demuxer.h"
#ifdef USE_TV
extern char* tv_param_channel;
#endif
static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
stream->type = STREAMTYPE_DUMMY;
if(strncmp("mf://",stream->url,5) == 0) {
*file_format = DEMUXER_TYPE_MF;
}
#ifdef USE_TV
else if (strncmp("tv://",stream->url,5) == 0) {
*file_format = DEMUXER_TYPE_TV;
if(stream->url[5] != '\0')
tv_param_channel = strdup(stream->url + 5);
}
#endif
return 1;
}
@ -36,9 +24,6 @@ stream_info_t stream_info_null = {
"",
open_s,
{
#ifdef USE_TV
"tv",
#endif
"mf", "null", NULL },
NULL,
0 // Urls are an option string

49
stream/stream_tv.c Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright (C) 2006 Benjamin Zores
* Stream layer for TV Input, based on previous work from Albeu
*
* This program 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.
*
* This program 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 this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include "stream.h"
#include "demuxer.h"
static int
tv_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
{
extern char* tv_param_channel;
*file_format = DEMUXER_TYPE_TV;
if (strlen (stream->url) > 5 && stream->url[5] != '\0')
tv_param_channel = strdup (stream->url + 5);
return STREAM_OK;
}
stream_info_t stream_info_tv = {
"TV Input",
"tv",
"Benjamin Zores, Albeu",
"",
tv_stream_open,
{ "tv", NULL },
NULL,
1
};