RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

fix sizeof :)))) 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1826 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2001-09-01 18:39:46 +00:00
parent acc7b7085f
commit 6898407bff
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Gui/mplayer/play.c
View File

@ -50,6 +50,7 @@ void mplStop()
if ( !mplShMem->Playing ) return;
mplShMem->Playing=0;
mplShMem->TimeSec=0;
mplShMem->Position=0;
if ( !appMPlayer.subWindow.isFullScreen )
{
wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
@ -96,15 +97,9 @@ void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int he
void mplMPlayerInit( int argc,char* argv[], char *envp[] )
{
#if 0
mplShMem=shmem_alloc( ShMemSize );
#else
mplShMem=calloc( 1,ShMemSize );
#endif
signal( SIGTYPE,mplMainSigHandler );
memset( mplShMem,0,ShMemSize );
mplShMem=calloc( 1,sizeof( mplCommStruct ) );
mplShMem->Balance=50.0f;
signal( SIGTYPE,mplMainSigHandler );
}
float mplGetPosition( void )

2
Gui/mplayer/widgets.c
View File

@ -85,7 +85,7 @@ static void gtkThreadProc( int argc,char * argv[] )
void gtkInit( int argc,char* argv[], char *envp[] )
{
gtkShMem=shmem_alloc( ShMemSize );
gtkShMem=shmem_alloc( sizeof( gtkCommStruct ) );
if ( ( gtkPID = fork() ) == 0 ) gtkThreadProc( argc,argv );
}

2
Gui/mplayer/widgets.h
View File

@ -47,8 +47,6 @@ typedef struct
gtkOptionsStruct op;
} gtkCommStruct;
#define ShMemSize sizeof( gtkCommStruct )
extern gtkCommStruct * gtkShMem;
extern GtkWidget * SkinBrowser;