diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-03 18:57:52 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-03 18:57:52 +0000 |
commit | 18a39398225eb76e152b3b027a69ce0c7b9cf312 (patch) | |
tree | 76c4d846cecfa060b33bd2108a1eec94caf54910 /mplayer.c | |
parent | e687b7607fb8588e5d25f53f1c5d7a61b1f7bc4b (diff) | |
download | mpv-18a39398225eb76e152b3b027a69ce0c7b9cf312.tar.bz2 mpv-18a39398225eb76e152b3b027a69ce0c7b9cf312.tar.xz |
add equalizer support and fix some small bug...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6628 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 24 |
1 files changed, 2 insertions, 22 deletions
@@ -208,6 +208,7 @@ char* audio_lang=NULL; char* dvdsub_lang=NULL; static char* spudec_ifo=NULL; int vcd_track=0; +char* filename=NULL; //"MI2-Trailer.avi"; // cache2: static int stream_cache_size=0; @@ -492,7 +493,6 @@ static sh_video_t *sh_video=NULL; // for multifile support: play_tree_iter_t* playtree_iter = NULL; -char* filename=NULL; //"MI2-Trailer.avi"; int file_format=DEMUXER_TYPE_UNKNOWN; int delay_corrected=1; @@ -815,27 +815,8 @@ if(!use_stdin && !slave_mode){ #endif } -#if defined( HAVE_VCD ) && defined( USE_DVDREAD ) - if ( guiIntfStruct.DiskChanged ) - { -#ifdef USE_DVDREAD - switch ( guiIntfStruct.StreamType ) - { - case STREAMTYPE_DVD: filename=DEFAULT_DVD_DEVICE; break; - } -#endif - guiIntfStruct.DiskChanged=0; - guiGetEvent( guiCEvent,(char *)guiSetPlay ); - } -#endif + guiGetEvent( guiSetDefaults,NULL ); -#ifdef USE_SUB - if ( guiIntfStruct.SubtitleChanged || !guiIntfStruct.FilenameChanged ) - { - if ( ( guiIntfStruct.Subtitlename )&&( guiIntfStruct.Subtitlename[0] != 0 ) ) sub_name=guiIntfStruct.Subtitlename; - guiIntfStruct.SubtitleChanged=0; - } -#endif if ( ( guiIntfStruct.FilenameChanged || !filename ) #ifdef USE_DVDREAD && ( guiIntfStruct.StreamType != STREAMTYPE_DVD ) @@ -862,7 +843,6 @@ if(!use_stdin && !slave_mode){ } guiIntfStruct.FilenameChanged=0; } - audio_stream=guiIntfStruct.AudioFile; } #endif //--------------------------------------------------------------------------- |