November 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libmpdemux demux_mov.c,1.85,1.86
by Arpi of Ize 29 Nov '02

29 Nov '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv32199 Modified Files: demux_mov.c Log Message: dump URL references Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- demux_mov.c 29 Nov 2002 20:25:32 -0000 1.85 +++ demux_mov.c 29 Nov 2002 21:06:13 -0000 1.86 @@ -291,6 +291,7 @@ memset(priv,0,sizeof(mov_priv_t)); while(1){ + int i; int skipped=8; off_t len=stream_read_dword(demuxer->stream); unsigned int id=stream_read_dword(demuxer->stream); @@ -317,7 +318,6 @@ switch(id){ case MOV_FOURCC('f','t','y','p'): { - int i; unsigned int tmp; // File Type Box (ftyp): // char[4] major_brand (eg. 'isom') @@ -352,6 +352,46 @@ priv->moov_end=(off_t)priv->moov_start+len-skipped; mp_msg(MSGT_DEMUX,MSGL_DBG2,"MOV: Movie header: start: %x end: %x\n", priv->moov_start, priv->moov_end); + skipped+=8; + i = stream_read_dword(demuxer->stream)-8; + if(stream_read_dword(demuxer->stream)==MOV_FOURCC('r','m','r','a')){ + int ref=0; + skipped+=i; + mp_msg(MSGT_DEMUX,MSGL_INFO,"MOV: Reference Media file!!!\n"); + while(i>0){ + int len=stream_read_dword(demuxer->stream)-8; + int fcc=stream_read_dword(demuxer->stream); + if(len<0) break; // EOF!? + i-=8; +// printf("i=%d len=%d\n",i,len); + switch(fcc){ + case MOV_FOURCC('r','m','d','a'): + continue; + case MOV_FOURCC('r','d','r','f'): { + int tmp=stream_read_dword(demuxer->stream); + int type=stream_read_dword_le(demuxer->stream); + int slen=stream_read_dword(demuxer->stream); + char* s=malloc(slen+1); + stream_read(demuxer->stream,s,slen); + s[slen]=0; + mp_msg(MSGT_DEMUX,MSGL_INFO,"REF: [%.4s] %s\n",&type,s); + len-=12+slen;i-=12+slen; break; + } + case MOV_FOURCC('r','m','d','r'): { + int flags=stream_read_dword(demuxer->stream); + int rate=stream_read_dword(demuxer->stream); + mp_msg(MSGT_DEMUX,MSGL_V," min. data rate: %d bits/sec\n",rate); + len-=8; i-=8; break; + } + case MOV_FOURCC('r','m','q','u'): { + int q=stream_read_dword(demuxer->stream); + mp_msg(MSGT_DEMUX,MSGL_V," quality index: %d\n",q); + len-=4; i-=4; break; + } + } + i-=len;stream_skip(demuxer->stream,len); + } + } flags|=1; break; case MOV_FOURCC('w','i','d','e'):

1 0

CVS: main/libmpdemux demux_mov.c,1.84,1.85
by Arpi of Ize 29 Nov '02

29 Nov '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv8332 Modified Files: demux_mov.c Log Message: - parsing the handler reference atom (hnlr), save handler fourccs - support for dumping raw or un-zlib-ed packets of generic tracks (verbose>=3) - fixed a sig11 caused by too small stsd of video track Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- demux_mov.c 23 Nov 2002 17:31:44 -0000 1.84 +++ demux_mov.c 29 Nov 2002 20:25:32 -0000 1.85 @@ -104,6 +104,9 @@ int type; off_t pos; // + unsigned int media_handler; + unsigned int data_handler; + // int timescale; unsigned int length; int samplesize; // 0 = variable @@ -187,7 +190,7 @@ } // workaround for fixed-size video frames (dv and uncompressed) - if(!trak->samples_size && trak->type==MOV_TRAK_VIDEO){ + if(!trak->samples_size && trak->type!=MOV_TRAK_AUDIO){ trak->samples_size=s; trak->samples=malloc(sizeof(mov_sample_t)*s); for(i=0;i<s;i++) @@ -480,6 +483,29 @@ trak->length=stream_read_dword(demuxer->stream); break; } + case MOV_FOURCC('h','d','l','r'): { + unsigned int tmp=stream_read_dword(demuxer->stream); + unsigned int type=stream_read_dword_le(demuxer->stream); + unsigned int subtype=stream_read_dword_le(demuxer->stream); + unsigned int manufact=stream_read_dword_le(demuxer->stream); + unsigned int comp_flags=stream_read_dword(demuxer->stream); + unsigned int comp_mask=stream_read_dword(demuxer->stream); + int len=stream_read_char(demuxer->stream); + char* str=malloc(len+1); + stream_read(demuxer->stream,str,len); + str[len]=0; + mp_msg(MSGT_DEMUX,MSGL_V,"MOV: %*sHandler header: %.4s/%.4s (%.4s) %s\n",level,"",&type,&subtype,&manufact,str); + free(str); + switch(bswap_32(type)){ + case MOV_FOURCC('m','h','l','r'): + trak->media_handler=bswap_32(subtype); break; + case MOV_FOURCC('d','h','l','r'): + trak->data_handler=bswap_32(subtype); break; + default: + mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown handler class: 0x%X (%.4s)\n",bswap_32(type),&type); + } + break; + } case MOV_FOURCC('v','m','h','d'): { mp_msg(MSGT_DEMUX,MSGL_V,"MOV: %*sVideo header!\n",level,""); trak->type=MOV_TRAK_VIDEO; @@ -934,7 +960,7 @@ memcpy(&id->name,trak->stdata+42,32); id->depth=char2short(trak->stdata,74); id->clutID=char2short(trak->stdata,76); - memcpy(((char*)&id->clutID)+2,trak->stdata+78,trak->stdata_len-78); + if(trak->stdata_len>78) memcpy(((char*)&id->clutID)+2,trak->stdata+78,trak->stdata_len-78); sh->ImageDesc=id; #if 0 { FILE *f=fopen("ImageDescription","wb"); @@ -1123,14 +1149,14 @@ mp_msg(MSGT_DEMUX, MSGL_INFO, "Generic track - not completly understood! (id: %d)\n", trak->id); /* XXX: Also this contains the FLASH data */ + #if 0 - mp_msg(MSGT_DEMUX, MSGL_INFO, "Extracting samples to files (possibly this is an flash anim)\n"); { int pos = stream_tell(demuxer->stream); int i; int fd; char name[20]; - + for (i=0; i<trak->samples_size; i++) { char buf[trak->samples[i].size]; @@ -1387,6 +1413,74 @@ } lschunks(demuxer, 0, priv->moov_end, NULL); // mp_msg(MSGT_DEMUX, MSGL_INFO, "--------------\n"); + +#if 1 + if(verbose>2){ + int t_no; + for(t_no=0;t_no<priv->track_db;t_no++){ + mov_track_t* trak=priv->tracks[t_no]; + if(trak->type==MOV_TRAK_GENERIC){ + int i; + int fd; + char name[20]; + mp_msg(MSGT_DEMUX, MSGL_INFO, "MOV: Track #%d: Extracting %d data chunks to files\n",t_no,trak->samples_size); + for (i=0; i<trak->samples_size; i++) + { + int len=trak->samples[i].size; + char buf[len]; + stream_seek(demuxer->stream, trak->samples[i].pos); + snprintf(name, 20, "t%02d-s%03d.%s", t_no,i, + (trak->media_handler==MOV_FOURCC('f','l','s','h')) ? + "swf":"dump"); + fd = open(name, O_CREAT|O_WRONLY); +// { int j; +// for(j=0;j<trak->stdata_len-3; j++) +// printf("stdata[%d]=0x%X ize=0x%X\n",j,char2int(trak->stdata,j),MOV_FOURCC('z','l','i','b')); +// } + if( //trak->media_handler==MOV_FOURCC('s','p','r','t') && + trak->stdata_len>=16 && + char2int(trak->stdata,12)==MOV_FOURCC('z','l','i','b') + ){ + int newlen=stream_read_dword(demuxer->stream); +#ifdef HAVE_ZLIB + // unzip: + z_stream zstrm; + int zret; + char buf2[newlen]; + + len-=4; + stream_read(demuxer->stream, buf, len); + + zstrm.zalloc = (alloc_func)0; + zstrm.zfree = (free_func)0; + zstrm.opaque = (voidpf)0; + zstrm.next_in = buf; + zstrm.avail_in = len; + zstrm.next_out = buf2; + zstrm.avail_out = newlen; + + zret = inflateInit(&zstrm); + zret = inflate(&zstrm, Z_NO_FLUSH); + if(newlen != zstrm.total_out) + mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! unzipped frame size differs hdr: %d zlib: %d\n",newlen,zstrm.total_out); + + write(fd, buf2, newlen); + } else { +#else + len-=4; + printf("******* ZLIB COMPRESSED SAMPLE!!!!! (%d->%d bytes) *******\n",len,newlen); + } + { +#endif + stream_read(demuxer->stream, buf, len); + write(fd, buf, len); + } + close(fd); + } + } + } + } +#endif return 1; }

1 0

CVS: main/help help_mp-pl.h,1.57,1.58
by Bohdan 'Nexus' Horst CVS 29 Nov '02

29 Nov '02

Update of /cvsroot/mplayer/main/help In directory mail:/var/tmp.root/cvs-serv22627 Modified Files: help_mp-pl.h Log Message: sync Index: help_mp-pl.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-pl.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- help_mp-pl.h 12 Nov 2002 12:23:32 -0000 1.57 +++ help_mp-pl.h 29 Nov 2002 09:30:16 -0000 1.58 @@ -490,6 +490,9 @@ #define MSGTR_PREFERENCES_Cache "Cache w³±cz/wy³±cz" #define MSGTR_PREFERENCES_LoadFullscreen "Rozpocznij na pe³nym ekranie" #define MSGTR_PREFERENCES_CacheSize "Wielko¶æ cache: " +#define MSGTR_PREFERENCES_XSCREENSAVER "Zatrzymaj Wygaszacz Ekranu" +#define MSGTR_PREFERENCES_AutoSync "Autosynchronizacja w³±cz/wy³±cz" +#define MSGTR_PREFERENCES_AutoSyncValue "Autosynchronizacja: " // --- messagebox #define MSGTR_MSGBOX_LABEL_FatalError "b³±d krytyczny ..."

1 0

CVS: main/Gui app.c,1.17,1.18 app.h,1.12,1.13 interface.c,1.62,1.63 interface.h,1.31,1.32
by Zoltan Ponekker 29 Nov '02

29 Nov '02

Update of /cvsroot/mplayer/main/Gui In directory mail:/var/tmp.root/cvs-serv16537/Gui Modified Files: app.c app.h interface.c interface.h Log Message: - audio track handling in menu (idea from Rüdiger Kuhlmann) - some userfriendly changes in menu Index: app.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/app.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- app.c 27 Nov 2002 23:11:39 -0000 1.17 +++ app.c 29 Nov 2002 00:58:22 -0000 1.18 @@ -62,7 +62,8 @@ { evSetURL, "evSetURL" }, { evLoadAudioFile, "evLoadAudioFile" }, { evDropSubtitle, "evDropSubtitle" }, - { evSetAspect, "evSetAspect" } + { evSetAspect, "evSetAspect" }, + { evSetAudio, "evSetAudio" } }; int evBoxs = sizeof( evNames ) / sizeof( evName ); Index: app.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/app.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- app.h 27 Nov 2002 23:11:39 -0000 1.12 +++ app.h 29 Nov 2002 00:58:22 -0000 1.13 @@ -57,7 +57,8 @@ #define evPlayNetwork 41 #define evLoadAudioFile 42 #define evSetAspect 44 -// 45 ... +#define evSetAudio 45 +// 46 ... #define evExit 1000 Index: interface.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/interface.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- interface.c 28 Nov 2002 23:17:10 -0000 1.62 +++ interface.c 29 Nov 2002 00:58:22 -0000 1.63 @@ -454,6 +454,9 @@ case guiReDrawSubWindow: wsPostRedisplay( &appMPlayer.subWindow ); break; + case guiSetDemuxer: + guiIntfStruct.demuxer=(void *)arg; + break; case guiSetShVideo: { if ( !appMPlayer.subWindow.isFullScreen ) Index: interface.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/interface.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- interface.h 28 Nov 2002 00:44:09 -0000 1.31 +++ interface.h 29 Nov 2002 00:58:22 -0000 1.32 @@ -59,6 +59,7 @@ guiUnknowErrorStruct error; void * sh_video; + void * demuxer; void * event_struct; int DiskChanged; @@ -123,6 +124,7 @@ #define guiSetDefaults 12 #define guiSetValues 13 #define guiSetFileFormat 14 +#define guiSetDemuxer 15 #define guiSetStop 0 #define guiSetPlay 1

1 0

CVS: main mplayer.c,1.617,1.618
by Zoltan Ponekker 29 Nov '02

29 Nov '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv16537 Modified Files: mplayer.c Log Message: - audio track handling in menu (idea from Rüdiger Kuhlmann) - some userfriendly changes in menu Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.617 retrieving revision 1.618 diff -u -r1.617 -r1.618 --- mplayer.c 28 Nov 2002 23:17:09 -0000 1.617 +++ mplayer.c 29 Nov 2002 00:58:06 -0000 1.618 @@ -1350,6 +1350,7 @@ if ( !sh_video && sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 ); guiGetEvent( guiSetFileFormat,(char *)demuxer->file_format ); if ( guiGetEvent( guiSetValues,(char *)sh_video ) ) goto goto_next_file; + guiGetEvent( guiSetDemuxer,(char *)demuxer ); } #endif

1 0

CVS: main/Gui/mplayer/gtk menu.c,1.24,1.25
by Zoltan Ponekker 29 Nov '02

29 Nov '02

Update of /cvsroot/mplayer/main/Gui/mplayer/gtk In directory mail:/var/tmp.root/cvs-serv16537/Gui/mplayer/gtk Modified Files: menu.c Log Message: - audio track handling in menu (idea from Rüdiger Kuhlmann) - some userfriendly changes in menu Index: menu.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/menu.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- menu.c 27 Nov 2002 22:48:56 -0000 1.24 +++ menu.c 29 Nov 2002 00:58:25 -0000 1.25 @@ -14,6 +14,8 @@ #include "../widgets.h" #include "../app.h" +#include "../../../libmpdemux/demuxer.h" + void ActivateMenuItem( int Item ) { // fprintf( stderr,"[menu] item: %d.%d\n",Item&0xffff,Item>>16 ); @@ -411,11 +413,29 @@ gtk_widget_set_sensitive( MenuItem,FALSE ); } #endif - AspectMenu=AddSubMenu( Menu,MSGTR_MENU_AspectRatio ); - AddMenuItem( AspectMenu,MSGTR_MENU_Original,( 1 << 16 ) + evSetAspect ); - AddMenuItem( AspectMenu,"16:9",( 2 << 16 ) + evSetAspect ); - AddMenuItem( AspectMenu,"4:3",( 3 << 16 ) + evSetAspect ); - AddMenuItem( AspectMenu,"2.35",( 4 << 16 ) + evSetAspect ); + + if ( guiIntfStruct.Playing ) + { + AspectMenu=AddSubMenu( Menu,MSGTR_MENU_AspectRatio ); + AddMenuItem( AspectMenu,MSGTR_MENU_Original,( 1 << 16 ) + evSetAspect ); + AddMenuItem( AspectMenu,"16:9",( 2 << 16 ) + evSetAspect ); + AddMenuItem( AspectMenu,"4:3",( 3 << 16 ) + evSetAspect ); + AddMenuItem( AspectMenu,"2.35",( 4 << 16 ) + evSetAspect ); + } + + if ( guiIntfStruct.demuxer ) + { + int i,c = 0; + + for ( i=0;i < MAX_A_STREAMS;i++ ) + if ( ((demuxer_t *)guiIntfStruct.demuxer)->a_streams[i] ) + { + char tmp[32]; + snprintf( tmp,32,"Track %d",i ); + if ( !c ) { SubMenu=AddSubMenu( Menu, "Audio track" ); c=1; } + AddMenuItem( SubMenu,tmp,( i << 16 ) + evSetAudio ); + } + } AddSeparator( Menu ); MenuItem=AddMenuCheckItem( Menu,MSGTR_MENU_Mute,muted,evMute ); @@ -424,11 +444,11 @@ AddMenuItem( Menu,MSGTR_MENU_SkinBrowser, evSkinBrowser ); AddMenuItem( Menu,MSGTR_MENU_Preferences, evPreferences ); AddMenuItem( Menu,MSGTR_Equalizer, evEqualizer ); - AddSeparator( Menu ); if ( guiIntfStruct.NoWindow == False ) { int b1 = 0, b2 = 0; + AddSeparator( Menu ); if ( !appMPlayer.subWindow.isFullScreen && guiIntfStruct.Playing ) { if ( ( appMPlayer.subWindow.Width == guiIntfStruct.MovieWidth * 2 )&& @@ -439,12 +459,6 @@ AddMenuCheckItem( Menu,MSGTR_MENU_DoubleSize,b2,evDoubleSize ); AddMenuCheckItem( Menu,MSGTR_MENU_FullScreen,appMPlayer.subWindow.isFullScreen,evFullScreen ); } - else - { - MenuItem=AddMenuCheckItem( Menu,MSGTR_MENU_NormalSize" ",0,evNormalSize ); gtk_widget_set_sensitive( MenuItem,FALSE ); - MenuItem=AddMenuCheckItem( Menu,MSGTR_MENU_DoubleSize,0,evDoubleSize ); gtk_widget_set_sensitive( MenuItem,FALSE ); - MenuItem=AddMenuCheckItem( Menu,MSGTR_MENU_FullScreen,0,evFullScreen ); gtk_widget_set_sensitive( MenuItem,FALSE ); - } AddSeparator( Menu ); AddMenuItem( Menu,MSGTR_MENU_Exit, evExit );

1 0

CVS: main/Gui/mplayer mw.c,1.94,1.95
by Zoltan Ponekker 29 Nov '02

29 Nov '02

Update of /cvsroot/mplayer/main/Gui/mplayer In directory mail:/var/tmp.root/cvs-serv16537/Gui/mplayer Modified Files: mw.c Log Message: - audio track handling in menu (idea from Rüdiger Kuhlmann) - some userfriendly changes in menu Index: mw.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- mw.c 28 Nov 2002 19:01:45 -0000 1.94 +++ mw.c 29 Nov 2002 00:58:24 -0000 1.95 @@ -270,6 +270,13 @@ case evSetURL: gtkShow( evPlayNetwork,NULL ); break; + + case evSetAudio: + if ( !guiIntfStruct.demuxer ) break; + audio_id=(int)param; + if ( guiIntfStruct.StreamType == STREAMTYPE_DVD ) goto play; + guiIntfStruct.FilenameChanged=1; + break; #ifdef HAVE_VCD case evSetVCDTrack:

1 0

CVS: main/Gui cfg.c,1.23,1.24 cfg.h,1.8,1.9 interface.c,1.61,1.62
by Zoltan Ponekker 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main/Gui In directory mail:/var/tmp.root/cvs-serv15309/Gui Modified Files: cfg.c cfg.h interface.c Log Message: add autosync && some 10l bugfix Index: cfg.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- cfg.c 28 Nov 2002 21:33:59 -0000 1.23 +++ cfg.c 28 Nov 2002 23:17:10 -0000 1.24 @@ -42,6 +42,9 @@ int gtkCacheOn = 0; int gtkCacheSize = 2048; +int gtkAutoSyncOn = 0; +int gtkAutoSync = 0; + #ifdef HAVE_DXR3 char * gtkDXR3Device; #endif @@ -111,11 +114,14 @@ { "font_autoscale",&subtitle_autoscale,CONF_TYPE_INT,CONF_RANGE,0,3,NULL }, #endif - { "cache",&gtkCacheOn,CONF_TYPE_INT,CONF_RANGE,-1,65535,NULL }, + { "cache",&gtkCacheOn,CONF_TYPE_FLAG,0,0,1,NULL }, { "cache_size",&gtkCacheSize,CONF_TYPE_INT,CONF_RANGE,-1,65535,NULL }, { "load_fullscreen",&gtkLoadFullscreen,CONF_TYPE_FLAG,0,0,1,NULL }, { "stopxscreensaver",&stop_xscreensaver,CONF_TYPE_FLAG,0,0,1,NULL }, + + { "autosync",&gtkAutoSyncOn,CONF_TYPE_FLAG,0,0,1,NULL }, + { "autosync_size",&gtkAutoSync,CONF_TYPE_INT,CONF_RANGE,0,10000,NULL }, { "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL }, Index: cfg.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/cfg.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cfg.h 25 Nov 2002 18:18:43 -0000 1.8 +++ cfg.h 28 Nov 2002 23:17:10 -0000 1.9 @@ -20,6 +20,9 @@ extern int gtkCacheOn; extern int gtkCacheSize; +extern int gtkAutoSyncOn; +extern int gtkAutoSync; + extern int gtkSubDumpMPSub; extern int gtkSubDumpSrt; Index: interface.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/interface.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- interface.c 28 Nov 2002 00:44:09 -0000 1.61 +++ interface.c 28 Nov 2002 23:17:10 -0000 1.62 @@ -167,7 +167,9 @@ #ifdef HAVE_DXR3 if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" ); #endif - fullscreen=gtkLoadFullscreen; + fullscreen=gtkLoadFullscreen; + if ( stream_cache_size != -1 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; } + if ( autosync && autosync != gtkAutoSync ) { gtkAutoSyncOn=1; gtkAutoSync=autosync; } gtkInit(); // --- initialize X @@ -551,6 +553,9 @@ if ( gtkCacheOn ) stream_cache_size=gtkCacheSize; else stream_cache_size=-1; + + if ( gtkAutoSyncOn ) autosync=gtkAutoSync; + else autosync=0; // -- audio if ( audio_out )

1 0

CVS: main mplayer.c,1.616,1.617 mplayer.h,1.22,1.23
by Zoltan Ponekker 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv15309 Modified Files: mplayer.c mplayer.h Log Message: add autosync && some 10l bugfix Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.616 retrieving revision 1.617 diff -u -r1.616 -r1.617 --- mplayer.c 28 Nov 2002 19:13:14 -0000 1.616 +++ mplayer.c 28 Nov 2002 23:17:09 -0000 1.617 @@ -186,7 +186,7 @@ static int loop_times=-1; // A/V sync: -static int autosync=0; // 30 might be a good default value. + int autosync=0; // 30 might be a good default value. // may be changed by GUI: (FIXME!) float rel_seek_secs=0; Index: mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mplayer.h 21 Oct 2002 11:11:20 -0000 1.22 +++ mplayer.h 28 Nov 2002 23:17:09 -0000 1.23 @@ -38,6 +38,7 @@ extern int stream_cache_size; extern int force_ni; extern int index_mode; +extern int autosync; // libmpcodecs: extern int fullscreen;

1 0

CVS: main/help help_mp-en.h,1.66,1.67
by Zoltan Ponekker 28 Nov '02

28 Nov '02

Update of /cvsroot/mplayer/main/help In directory mail:/var/tmp.root/cvs-serv15309/help Modified Files: help_mp-en.h Log Message: add autosync && some 10l bugfix Index: help_mp-en.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-en.h,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- help_mp-en.h 11 Nov 2002 19:19:48 -0000 1.66 +++ help_mp-en.h 28 Nov 2002 23:17:14 -0000 1.67 @@ -491,6 +491,9 @@ #define MSGTR_PREFERENCES_Cache "Cache on/off" #define MSGTR_PREFERENCES_LoadFullscreen "Start in fullscreen" #define MSGTR_PREFERENCES_CacheSize "Cache size: " +#define MSGTR_PREFERENCES_XSCREENSAVER "Stop XScreenSaver" +#define MSGTR_PREFERENCES_AutoSync "AutoSync on/off" +#define MSGTR_PREFERENCES_AutoSyncValue "Autosync: " // --- messagebox #define MSGTR_MSGBOX_LABEL_FatalError "Fatal error!"

1 0