[MPlayer-cvslog] r19307 - in trunk/stream: Makefile stream.c stream.h stream_mf.c stream_null.c

[ben]

Author: ben
Date: Thu Aug  3 21:43:02 2006
New Revision: 19307

Added:
   trunk/stream/stream_mf.c
Modified:
   trunk/stream/Makefile
   trunk/stream/stream.c
   trunk/stream/stream.h
   trunk/stream/stream_null.c

Log:
added dedicated file for mf:// input

Modified: trunk/stream/Makefile
==============================================================================
--- trunk/stream/Makefile	(original)
+++ trunk/stream/Makefile	Thu Aug  3 21:43:02 2006
@@ -22,6 +22,7 @@
 SRCS += stream.c \
         stream_cue.c \
         stream_file.c \
+        stream_mf.c \
         stream_null.c \
 
 ifeq ($(HAVE_DVD),yes)

Modified: trunk/stream/stream.c
==============================================================================
--- trunk/stream/stream.c	(original)
+++ trunk/stream/stream.c	Thu Aug  3 21:43:02 2006
@@ -79,6 +79,7 @@
 
 extern stream_info_t stream_info_cue;
 extern stream_info_t stream_info_null;
+extern stream_info_t stream_info_mf;
 extern stream_info_t stream_info_file;
 #ifdef HAVE_DVD
 extern stream_info_t stream_info_dvd;
@@ -131,6 +132,7 @@
 #endif
 
   &stream_info_null,
+  &stream_info_mf,
   &stream_info_file,
   NULL
 };

Modified: trunk/stream/stream.h
==============================================================================
--- trunk/stream/stream.h	(original)
+++ trunk/stream/stream.h	Thu Aug  3 21:43:02 2006
@@ -23,6 +23,7 @@
 #define STREAMTYPE_SDP 15
 #define STREAMTYPE_PVR 16
 #define STREAMTYPE_TV 17
+#define STREAMTYPE_MF 18
 
 #define STREAM_BUFFER_SIZE 2048
 

Added: trunk/stream/stream_mf.c
==============================================================================
--- (empty file)
+++ trunk/stream/stream_mf.c	Thu Aug  3 21:43:02 2006
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (C) 2006 Benjamin Zores
+ *   Stream layer for multiple files 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
+mf_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
+{
+  stream->type = STREAMTYPE_MF;
+  *file_format = DEMUXER_TYPE_MF;
+  
+  return STREAM_OK;
+}
+
+stream_info_t stream_info_mf = {
+  "Multiple files input",
+  "mf",
+  "Benjamin Zores, Albeu",
+  "",
+  mf_stream_open, 			
+  { "mf", NULL },
+  NULL,
+  1
+};

Modified: trunk/stream/stream_null.c
==============================================================================
--- trunk/stream/stream_null.c	(original)
+++ trunk/stream/stream_null.c	Thu Aug  3 21:43:02 2006
@@ -10,9 +10,6 @@
 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;
-  } 
   return 1;
 }
 
@@ -23,8 +20,7 @@
   "Albeu",
   "",
   open_s,
-  { 
-"mf", "null", NULL },
+  { "null", NULL },
   NULL,
   0 // Urls are an option string
 };