mf.[hc] belong to libmpdemux

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19306 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 1 insertions, 174 deletions

diff --git a/stream/Makefile b/stream/Makefile
index f4e04fbcbe..b63317347d 100644
--- a/stream/Makefile
+++ b/stream/Makefile
@@ -4,8 +4,7 @@ LIBNAME = stream.a
 include ../config.mak
 
 # Core
-SRCS += mf.c \
-        open.c \
+SRCS += open.c \
         url.c \
 
 ifeq ($(STREAM_CACHE),yes)
diff --git a/stream/mf.c b/stream/mf.c
deleted file mode 100644
index 2c05ea0e35..0000000000
--- a/stream/mf.c
+++ /dev/null
@@ -1,153 +0,0 @@
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "config.h"
-
-#ifdef HAVE_GLOB
-#include <glob.h>
-#else
-#include "osdep/glob.h"
-#endif
-
-#include "mp_msg.h"
-#include "help_mp.h"
-#include "stream.h"
-
-#include "mf.h"
-
-int    mf_w = 0; //352; // let codecs to detect it
-int    mf_h = 0; //288;
-float  mf_fps = 25.0;
-char * mf_type = NULL; //"jpg";
-
-mf_t* open_mf(char * filename){
-#if defined(HAVE_GLOB) || defined(__MINGW32__)
- glob_t        gg;
- struct stat   fs;
- int           i;
- char        * fname;
- mf_t        * mf;
- int           error_count = 0;
- int	       count = 0;
-
- mf=calloc( 1,sizeof( mf_t ) );
-
- if( filename[0] == '@' )
-  { 
-   FILE *lst_f=fopen(filename + 1,"r");
-   if ( lst_f ) 
-    {
-     fname=malloc( 255 );
-     while ( fgets( fname,255,lst_f ) ) 
-      {
-       /* remove spaces from end of fname */
-       char *t=fname + strlen( fname ) - 1;
-       while ( t > fname && isspace( *t ) ) *(t--)=0;
-       if ( stat( fname,&fs ) ) 
-        {
-         mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname );
-        }
-        else
-        {
-         mf->names=realloc( mf->names,( mf->nr_of_files + 1 ) * sizeof( char* ) );
-         mf->names[mf->nr_of_files]=strdup( fname );
-         mf->nr_of_files++;
-        }
-      }
-      fclose( lst_f );
-	     
-      mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d\n",mf->nr_of_files );
-      goto exit_mf;
-    }
-    mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] %s is not indirect filelist\n",filename+1 );
-  }
-
- if( strchr( filename,',') )
-  { 
-   mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] filelist: %s\n",filename );
- 
-   while ( ( fname=strsep( &filename,"," ) ) )
-    {
-     if ( stat( fname,&fs ) ) 
-      {
-       mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname );
-      }
-      else
-      {
-       mf->names=realloc( mf->names,( mf->nr_of_files + 1 ) * sizeof( char* ) );
-       mf->names[mf->nr_of_files]=strdup( fname );
-//       mp_msg( MSGT_STREAM,MSGL_V,"[mf] added file %d.: %s\n",mf->nr_of_files,mf->names[mf->nr_of_files] );
-       mf->nr_of_files++;
-      }
-    }
-   mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d\n",mf->nr_of_files );
- 
-   goto exit_mf;
-  } 
-
- fname=malloc( strlen( filename ) + 32 );
-
- if ( !strchr( filename,'%' ) )
-  {
-   strcpy( fname,filename ); 
-   if ( !strchr( filename,'*' ) ) strcat( fname,"*" );
-
-   mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] search expr: %s\n",fname );
-
-   if ( glob( fname,0,NULL,&gg ) )
-    { free( mf ); free( fname ); return NULL; }
-
-   mf->nr_of_files=gg.gl_pathc;
-   mf->names=calloc( gg.gl_pathc, sizeof( char* ) );
-
-   mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d (%d)\n",mf->nr_of_files, gg.gl_pathc * sizeof( char* ) );
-
-   for( i=0;i < gg.gl_pathc;i++ )
-    {
-     stat( gg.gl_pathv[i],&fs );
-     if( S_ISDIR( fs.st_mode ) ) continue;
-     mf->names[i]=strdup( gg.gl_pathv[i] );
-//     mp_msg( MSGT_STREAM,MSGL_DBG2,"[mf] added file %d.: %s\n",i,mf->names[i] );
-    }
-   globfree( &gg );
-   goto exit_mf;
-  }
-
- mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] search expr: %s\n",filename );
- 
- while ( error_count < 5 )
-  {
-   sprintf( fname,filename,count++ );
-   if ( stat( fname,&fs ) ) 
-    {
-     error_count++;
-     mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname );
-    }
-    else
-    {
-     mf->names=realloc( mf->names,( mf->nr_of_files + 1 ) * sizeof( char* ) );
-     mf->names[mf->nr_of_files]=strdup( fname );
-//     mp_msg( MSGT_STREAM,MSGL_V,"[mf] added file %d.: %s\n",mf->nr_of_files,mf->names[mf->nr_of_files] );
-     mf->nr_of_files++;
-    }
-  }
-
- mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d\n",mf->nr_of_files );
-
-exit_mf:
- free( fname );
- return mf;
-#else
- mp_msg(MSGT_STREAM,MSGL_FATAL,"[mf] mf support is disabled on your os\n");
- return 0;
-#endif
-}
-
diff --git a/stream/mf.h b/stream/mf.h
deleted file mode 100644
index b288063a28..0000000000
--- a/stream/mf.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#ifndef _MF_H
-#define _MF_H
-
-extern int    mf_w;
-extern int    mf_h;
-extern float  mf_fps;
-extern char * mf_type;
-
-typedef struct
-{
- int curr_frame;
- int nr_of_files;
- char ** names;
-} mf_t;
-
-mf_t* open_mf(char * filename);
-
-#endif