mirror of https://github.com/mpv-player/mpv
fix sizeof :))))
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1826 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
acc7b7085f
commit
6898407bff
|
@ -50,6 +50,7 @@ void mplStop()
|
||||||
if ( !mplShMem->Playing ) return;
|
if ( !mplShMem->Playing ) return;
|
||||||
mplShMem->Playing=0;
|
mplShMem->Playing=0;
|
||||||
mplShMem->TimeSec=0;
|
mplShMem->TimeSec=0;
|
||||||
|
mplShMem->Position=0;
|
||||||
if ( !appMPlayer.subWindow.isFullScreen )
|
if ( !appMPlayer.subWindow.isFullScreen )
|
||||||
{
|
{
|
||||||
wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
|
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[] )
|
void mplMPlayerInit( int argc,char* argv[], char *envp[] )
|
||||||
{
|
{
|
||||||
#if 0
|
mplShMem=calloc( 1,sizeof( mplCommStruct ) );
|
||||||
mplShMem=shmem_alloc( ShMemSize );
|
|
||||||
#else
|
|
||||||
mplShMem=calloc( 1,ShMemSize );
|
|
||||||
#endif
|
|
||||||
signal( SIGTYPE,mplMainSigHandler );
|
|
||||||
|
|
||||||
memset( mplShMem,0,ShMemSize );
|
|
||||||
mplShMem->Balance=50.0f;
|
mplShMem->Balance=50.0f;
|
||||||
|
signal( SIGTYPE,mplMainSigHandler );
|
||||||
}
|
}
|
||||||
|
|
||||||
float mplGetPosition( void )
|
float mplGetPosition( void )
|
||||||
|
|
|
@ -85,7 +85,7 @@ static void gtkThreadProc( int argc,char * argv[] )
|
||||||
|
|
||||||
void gtkInit( int argc,char* argv[], char *envp[] )
|
void gtkInit( int argc,char* argv[], char *envp[] )
|
||||||
{
|
{
|
||||||
gtkShMem=shmem_alloc( ShMemSize );
|
gtkShMem=shmem_alloc( sizeof( gtkCommStruct ) );
|
||||||
if ( ( gtkPID = fork() ) == 0 ) gtkThreadProc( argc,argv );
|
if ( ( gtkPID = fork() ) == 0 ) gtkThreadProc( argc,argv );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,8 +47,6 @@ typedef struct
|
||||||
gtkOptionsStruct op;
|
gtkOptionsStruct op;
|
||||||
} gtkCommStruct;
|
} gtkCommStruct;
|
||||||
|
|
||||||
#define ShMemSize sizeof( gtkCommStruct )
|
|
||||||
|
|
||||||
extern gtkCommStruct * gtkShMem;
|
extern gtkCommStruct * gtkShMem;
|
||||||
|
|
||||||
extern GtkWidget * SkinBrowser;
|
extern GtkWidget * SkinBrowser;
|
||||||
|
|
Loading…
Reference in New Issue