summaryrefslogtreecommitdiffstats
path: root/libmpdemux/mf.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-05 17:02:04 +0100
committerwm4 <wm4@nowhere>2012-11-12 20:06:14 +0100
commitd4bdd0473d6f43132257c9fb3848d829755167a3 (patch)
tree8021c2f7da1841393c8c832105e20cd527826d6c /libmpdemux/mf.c
parentbd48deba77bd5582c5829d6fe73a7d2571088aba (diff)
downloadmpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.bz2
mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.xz
Rename directories, move files (step 1 of 2) (does not compile)
Tis drops the silly lib prefixes, and attempts to organize the tree in a more logical way. Make the top-level directory less cluttered as well. Renames the following directories: libaf -> audio/filter libao2 -> audio/out libvo -> video/out libmpdemux -> demux Split libmpcodecs: vf* -> video/filter vd*, dec_video.* -> video/decode mp_image*, img_format*, ... -> video/ ad*, dec_audio.* -> audio/decode libaf/format.* is moved to audio/ - this is similar to how mp_image.* is located in video/. Move most top-level .c/.h files to core. (talloc.c/.h is left on top- level, because it's external.) Park some of the more annoying files in compat/. Some of these are relicts from the time mplayer used ffmpeg internals. sub/ is not split, because it's too much of a mess (subtitle code is mixed with OSD display and rendering). Maybe the organization of core is not ideal: it mixes playback core (like mplayer.c) and utility helpers (like bstr.c/h). Should the need arise, the playback core will be moved somewhere else, while core contains all helper and common code.
Diffstat (limited to 'libmpdemux/mf.c')
-rw-r--r--libmpdemux/mf.c171
1 files changed, 0 insertions, 171 deletions
diff --git a/libmpdemux/mf.c b/libmpdemux/mf.c
deleted file mode 100644
index d232944593..0000000000
--- a/libmpdemux/mf.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * 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.
- */
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
-
-#include "osdep/io.h"
-
-#include "config.h"
-
-#ifdef HAVE_GLOB
-#include <glob.h>
-#else
-#include "osdep/glob.h"
-#endif
-#include "osdep/strsep.h"
-
-#include "mp_msg.h"
-#include "stream/stream.h"
-#include "path.h"
-
-#include "mf.h"
-
-int mf_w = 0; //352; // let codecs to detect it
-int mf_h = 0; //288;
-double mf_fps = 25.0;
-char * mf_type = NULL; //"jpg";
-
-mf_t* open_mf(char * filename){
-#if defined(HAVE_GLOB) || defined(__MINGW32__)
- glob_t gg;
- 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(MP_PATH_MAX);
- while ( fgets( fname,MP_PATH_MAX,lst_f ) )
- {
- /* remove spaces from end of fname */
- char *t=fname + strlen( fname ) - 1;
- while ( t > fname && isspace( *t ) ) *(t--)=0;
- if ( !mp_path_exists( fname ) )
- {
- 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 ( !mp_path_exists( fname ) )
- {
- 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 (%zd)\n",mf->nr_of_files, gg.gl_pathc * sizeof( char* ) );
-
- for( i=0;i < gg.gl_pathc;i++ )
- {
- if (mp_path_isdir(gg.gl_pathv[i]))
- 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 ( !mp_path_exists( fname ) )
- {
- 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
-}