June 2004 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/Gui/mplayer common.c, 1.7, 1.8 common.h, 1.1, 1.2
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/Gui/mplayer In directory mail:/var2/tmp/cvs-serv4219/Gui/mplayer Modified Files: common.c common.h Log Message: simple, smooth, ram-saving dynamic potmeter, which feature is required by the tvisor skin, patch by Andre Kuhne Index: common.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/common.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- common.c 26 Jun 2004 13:26:11 -0000 1.7 +++ common.c 26 Jun 2004 13:54:20 -0000 1.8 @@ -214,6 +214,30 @@ #endif } +void SimplePotmeterPutImage( txSample * bf,int x,int y,float frac ) +{ + int i=0,w,r,ix,iy; + uint32_t * buf = NULL; + uint32_t * drw = NULL; + register uint32_t tmp; + + if ( ( !bf )||( bf->Image == NULL ) ) return; + + buf=(uint32_t *)image_buffer; + drw=(uint32_t *)bf->Image; + w=bf->Width*frac; + r=bf->Width-w; + for ( iy=y;iy < (int)(y+bf->Height);iy++ ) + { + for ( ix=x;ix < (int)(x+w);ix++ ) + { + tmp=drw[i++]; + if ( tmp != 0x00ff00ff ) buf[iy * image_width + ix]=tmp; + } + i+=r; + } +} + void Render( wsTWindow * window,wItem * Items,int nrItems,char * db,int size ) { wItem * item; @@ -232,10 +256,12 @@ PutImage( &item->Bitmap,item->x,item->y,3,item->pressed ); break; case itPotmeter: - PutImage( &item->Bitmap,item->x,item->y,item->phases,( item->phases - 1 ) * ( item->value / 100.0f ) ); + if (item->phases == 1)SimplePotmeterPutImage( &item->Bitmap,item->x,item->y, item->value / 100.0f ); + else PutImage( &item->Bitmap,item->x,item->y,item->phases,( item->phases - 1 ) * ( item->value / 100.0f ) ); break; case itHPotmeter: - PutImage( &item->Bitmap,item->x,item->y,item->phases,item->phases * ( item->value / 100.0f ) ); + if (item->phases == 1)SimplePotmeterPutImage( &item->Bitmap,item->x,item->y, item->value / 100.0f ); + else PutImage( &item->Bitmap,item->x,item->y,item->phases,( item->phases - 1 ) * ( item->value / 100.0f ) ); PutImage( &item->Mask,item->x + (int)( ( item->width - item->psx ) * item->value / 100.0f ),item->y,3,item->pressed ); break; case itVPotmeter: Index: common.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/common.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- common.h 17 Jan 2003 22:39:39 -0000 1.1 +++ common.h 26 Jun 2004 13:54:20 -0000 1.2 @@ -14,6 +14,7 @@ extern inline void TranslateFilename( int c,char * tmp ); extern char * Translate( char * str ); extern void PutImage( txSample * bf,int x,int y,int max,int ofs ); +extern void SimplePotmeterPutImage( txSample * bf,int x,int y,float frac ); extern void Render( wsTWindow * window,wItem * Items,int nrItems,char * db,int size ); #endif

1 0

CVS: main/libdha Makefile,1.22,1.23
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libdha In directory mail:/var2/tmp/cvs-serv12676 Modified Files: Makefile Log Message: make the awk script working for localized machines too, patch by Onur Kucuk Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libdha/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Makefile 26 Mar 2004 12:11:30 -0000 1.22 +++ Makefile 26 Jun 2004 13:48:35 -0000 1.23 @@ -2,8 +2,8 @@ include ../config.mak -MAJOR_VERSION = 0 -MINOR_VERSION = 1 +MAJOR_VERSION = 1 +MINOR_VERSION = 0 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION) @@ -60,7 +60,7 @@ all: $(LIBNAME) $(SHORTNAME) pci_names.c: - $(AWK) -f pci_db2c.awk oth/pci.db + LC_CTYPE=C $(AWK) -f pci_db2c.awk oth/pci.db test: $(CC) test.c -o test $(SHORTNAME)

1 0

CVS: main/Gui interface.c,1.94,1.95
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/Gui In directory mail:/var2/tmp/cvs-serv10651/Gui Modified Files: interface.c Log Message: Fix GUI compilation, patch by Reimar Döffinger and Alexander Strasser. Index: interface.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/interface.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- interface.c 25 Jun 2004 16:49:52 -0000 1.94 +++ interface.c 26 Jun 2004 13:26:10 -0000 1.95 @@ -42,6 +42,8 @@ #include "../m_config.h" #include "../m_option.h" +extern mixer_t mixer; // mixer from mplayer.c + guiInterface_t guiIntfStruct; int guiWinID=-1; @@ -622,7 +624,7 @@ if ( audio_out ) { float l,r; - mixer_getvolume( &l,&r ); + mixer_getvolume( &mixer,&l,&r ); guiIntfStruct.Volume=(r>l?r:l); if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f; else guiIntfStruct.Balance=50.0f; @@ -651,7 +653,7 @@ if ( audio_out ) { float l,r; - mixer_getvolume( &l,&r ); + mixer_getvolume( &mixer,&l,&r ); guiIntfStruct.Volume=(r>l?r:l); if ( r != l ) guiIntfStruct.Balance=( ( r - l ) + 100 ) * 0.5f; else guiIntfStruct.Balance=50.0f;

1 0

CVS: main mplayer.c,1.758,1.759
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv10651 Modified Files: mplayer.c Log Message: Fix GUI compilation, patch by Reimar Döffinger and Alexander Strasser. Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.758 retrieving revision 1.759 diff -u -r1.758 -r1.759 --- mplayer.c 26 Jun 2004 10:51:44 -0000 1.758 +++ mplayer.c 26 Jun 2004 13:26:10 -0000 1.759 @@ -525,7 +525,7 @@ extern void mp_input_register_options(m_config_t* cfg); #include "mixer.h" -static mixer_t mixer; +mixer_t mixer; #include "cfg-mplayer.h"

1 0

[Mplayer-cvslog] CVS: main/Gui/mplayer/gtk menu.c, 1.30, 1.31 opts.c, 1.62, 1.63
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/Gui/mplayer/gtk In directory mail:/var2/tmp/cvs-serv10651/Gui/mplayer/gtk Modified Files: menu.c opts.c Log Message: Fix GUI compilation, patch by Reimar Döffinger and Alexander Strasser. Index: menu.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/menu.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- menu.c 8 Jan 2004 18:29:27 -0000 1.30 +++ menu.c 26 Jun 2004 13:26:11 -0000 1.31 @@ -17,6 +17,8 @@ #include "../../../libmpdemux/stream.h" #include "../../../libmpdemux/demuxer.h" +extern mixer_t mixer; // mixer from mplayer.c + void ActivateMenuItem( int Item ) { // fprintf( stderr,"[menu] item: %d.%d\n",Item&0xffff,Item>>16 ); @@ -462,7 +464,7 @@ } AddSeparator( Menu ); - MenuItem=AddMenuCheckItem( Menu,MSGTR_MENU_Mute,muted,evMute ); + MenuItem=AddMenuCheckItem( Menu,MSGTR_MENU_Mute,mixer.muted,evMute ); if ( !guiIntfStruct.AudioType ) gtk_widget_set_sensitive( MenuItem,FALSE ); AddMenuItem( Menu,MSGTR_MENU_PlayList, evPlayList ); AddMenuItem( Menu,MSGTR_MENU_SkinBrowser, evSkinBrowser ); Index: opts.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- opts.c 3 Feb 2004 19:02:45 -0000 1.62 +++ opts.c 26 Jun 2004 13:26:11 -0000 1.63 @@ -171,7 +171,6 @@ static void prEntry( GtkContainer * container,gpointer user_data ); #endif -extern int muted; extern int stop_xscreensaver; void ShowPreferences( void )

1 0

CVS: main/Gui/mplayer common.c, 1.6, 1.7 mw.c, 1.110, 1.111
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/Gui/mplayer In directory mail:/var2/tmp/cvs-serv10651/Gui/mplayer Modified Files: common.c mw.c Log Message: Fix GUI compilation, patch by Reimar Döffinger and Alexander Strasser. Index: common.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/common.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- common.c 26 Jun 2004 12:22:48 -0000 1.6 +++ common.c 26 Jun 2004 13:26:11 -0000 1.7 @@ -30,6 +30,8 @@ #include "play.h" #include "widgets.h" +extern mixer_t mixer; // mixer from mplayer.c + extern unsigned int GetTimerMS( void ); inline void TranslateFilename( int c,char * tmp,size_t tmplen ) @@ -143,7 +145,7 @@ case 'l': if ( guiIntfStruct.Playing == 1 ) strlcat( trbuf,"p",sizeof( trbuf ) ); break; case 'e': if ( guiIntfStruct.Playing == 2 ) strlcat( trbuf,"e",sizeof( trbuf ) ); break; case 'a': - if ( muted ) { strlcat( trbuf,"n",sizeof( trbuf ) ); break; } + if ( mixer.muted ) { strlcat( trbuf,"n",sizeof( trbuf ) ); break; } switch ( guiIntfStruct.AudioType ) { case 0: strlcat( trbuf,"n",sizeof( trbuf ) ); break; Index: mw.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- mw.c 26 May 2003 08:45:42 -0000 1.110 +++ mw.c 26 Jun 2004 13:26:11 -0000 1.111 @@ -30,6 +30,8 @@ #include "play.h" #include "widgets.h" +extern mixer_t mixer; // mixer from mplayer.c + extern unsigned int GetTimerMS( void ); unsigned char * mplDrawBuffer = NULL; @@ -242,7 +244,7 @@ case evIncVolume: vo_x11_putkey( wsGrayMul ); break; case evDecVolume: vo_x11_putkey( wsGrayDiv ); break; - case evMute: mixer_mute(); break; + case evMute: mixer_mute( &mixer ); break; case evSetVolume: guiIntfStruct.Volume=param; @@ -256,7 +258,7 @@ if ( l > guiIntfStruct.Volume ) l=guiIntfStruct.Volume; if ( r > guiIntfStruct.Volume ) r=guiIntfStruct.Volume; // printf( "!!! v: %.2f b: %.2f -> %.2f x %.2f\n",guiIntfStruct.Volume,guiIntfStruct.Balance,l,r ); - mixer_setvolume( l,r ); + mixer_setvolume( &mixer,l,r ); } #ifdef USE_OSD if ( osd_level )

1 0

CVS: main playtreeparser.c,1.28,1.29
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv27819 Modified Files: playtreeparser.c Log Message: Support for comments in plaintext playlist by adland Index: playtreeparser.c =================================================================== RCS file: /cvsroot/mplayer/main/playtreeparser.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- playtreeparser.c 6 Jun 2004 19:06:39 -0000 1.28 +++ playtreeparser.c 26 Jun 2004 13:07:04 -0000 1.29 @@ -555,7 +555,7 @@ while((line = play_tree_parser_get_line(p)) != NULL) { strstrip(line); - if(line[0] == '\0') + if(line[0] == '\0' || line[0] == '#' || (line[0] == '/' && line[1] == '/')) continue; //Special check for embedded smil or ram reference in file

1 0

CVS: main mixer.c,1.16,1.17
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv10322 Modified Files: mixer.c Log Message: 1000l Index: mixer.c =================================================================== RCS file: /cvsroot/mplayer/main/mixer.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mixer.c 26 Jun 2004 09:14:20 -0000 1.16 +++ mixer.c 26 Jun 2004 12:47:00 -0000 1.17 @@ -45,7 +45,7 @@ vol.right=r; vol.left=l; if(mixer->audio_out){ if(CONTROL_OK != mixer->audio_out->control(AOCONTROL_SET_VOLUME,&vol)) { - if (mixer->afilter) + if (!mixer->afilter) return; else { // af_volume uses values in dB

1 0

CVS: main/libdha pci.c,1.13,1.14
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libdha In directory mail:/var2/tmp/cvs-serv11110 Modified Files: pci.c Log Message: x86-64 (amd64) support by Kenny Root Index: pci.c =================================================================== RCS file: /cvsroot/mplayer/main/libdha/pci.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pci.c 2 Oct 2003 14:47:56 -0000 1.13 +++ pci.c 26 Jun 2004 12:40:56 -0000 1.14 @@ -492,6 +492,8 @@ #include "sysdep/pci_arm32.c" #elif defined(__powerpc__) #include "sysdep/pci_powerpc.c" +#elif defined(__x86_64__) +/* Nothing here right now */ #else #include "sysdep/pci_x86.c" #endif

1 0

CVS: main/libdha/sysdep pci_linux.c,1.9,1.10
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libdha/sysdep In directory mail:/var2/tmp/cvs-serv11110/sysdep Modified Files: pci_linux.c Log Message: x86-64 (amd64) support by Kenny Root Index: pci_linux.c =================================================================== RCS file: /cvsroot/mplayer/main/libdha/sysdep/pci_linux.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pci_linux.c 28 Mar 2004 16:30:08 -0000 1.9 +++ pci_linux.c 26 Jun 2004 12:40:56 -0000 1.10 @@ -7,7 +7,7 @@ #ifdef __i386__ // is this needed? #include <sys/perm.h> #else -#if !defined(__sparc__) && !defined(__powerpc__) +#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__x86_64__) #include <sys/io.h> #endif #endif @@ -117,8 +117,8 @@ return(0); } -#if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)) \ - && defined(__linux__) && !defined(CONFIG_SVGAHELPER) +#if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) \ + || defined(__x86_64__)) && defined(__linux__) && !defined(CONFIG_SVGAHELPER) #define CONFIG_PCI_LINUX_PROC #endif

1 0