github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-07-31 16:29:58 +02:00
Code Releases Activity

many 10l for me ...

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9626 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2003-03-20 12:42:16 +00:00
parent b45f146c37
commit 90b278bfaa
14 changed files with 59 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Gui/app.c
View File

@ -119,17 +119,20 @@ void appInitStruct( listItems * item )
appClearItem( &item->Items[i] );
for ( i=0;i<item->NumberOfMenuItems;i++ )
appClearItem( &item->MenuItems[i] );
for ( i=0;i<item->NumberOfBarItems;i++ )
appClearItem( &item->barItems[i] );
item->NumberOfItems=-1;
memset( item->Items,0,128 * sizeof( wItem ) );
memset( item->Items,0,256 * sizeof( wItem ) );
item->NumberOfMenuItems=-1;
memset( item->MenuItems,0,32 * sizeof( wItem ) );
memset( item->MenuItems,0,64 * sizeof( wItem ) );
item->NumberOfBarItems=-1;
memset( item->barItems,0,256 * sizeof( wItem ) );
appClearItem( &item->main );
item->mainDecoration=0;
appClearItem( &item->sub );
item->sub.Bitmap.Width=384; item->sub.Bitmap.Height=384;
item->sub.width=384; item->sub.height=384;
item->sub.width=0; item->sub.height=0;
item->sub.x=-1; item->sub.y=-1;
appClearItem( &item->menuBase );
appClearItem( &item->menuSelected );

2
Gui/app.h
View File

@ -164,7 +164,7 @@ typedef struct
wItem MenuItems[64];
// ---
int NumberOfBarItems;
wItem barItems[32];
wItem barItems[256];
} listItems;
extern listItems appMPlayer;

11
Gui/cfg.c
View File

@ -60,6 +60,11 @@ int gtkLoadFullscreen = 0;
int gtkShowVideoWindow = 1;
int gtkEnablePlayBar = 1;
int gui_save_pos = 1;
int gui_main_pos_x = -2;
int gui_main_pos_y = -2;
int gui_sub_pos_x = -1;
int gui_sub_pos_y = -1;
// ---
extern char * get_path( char * filename );
@ -144,6 +149,12 @@ static config_t gui_opts[] =
{ "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL },
{ "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG,0,0,1,NULL},
{ "gui_main_pos_x", &gui_main_pos_x, CONF_TYPE_INT,0,0,0,NULL},
{ "gui_main_pos_y", &gui_main_pos_y, CONF_TYPE_INT,0,0,0,NULL},
{ "gui_video_out_pos_x", &gui_sub_pos_x, CONF_TYPE_INT,0,0,0,NULL},
{ "gui_video_out_pos_y", &gui_sub_pos_y, CONF_TYPE_INT,0,0,0,NULL},
{ "equ_channel_1",&gtkEquChannel1,CONF_TYPE_STRING,0,0,0,NULL },
{ "equ_channel_2",&gtkEquChannel2,CONF_TYPE_STRING,0,0,0,NULL },
{ "equ_channel_3",&gtkEquChannel3,CONF_TYPE_STRING,0,0,0,NULL },

6
Gui/cfg.h
View File

@ -42,6 +42,12 @@ extern int gtkLoadFullscreen;
extern int gtkShowVideoWindow;
extern int gtkEnablePlayBar;
extern int gui_save_pos;
extern int gui_main_pos_x;
extern int gui_main_pos_y;
extern int gui_sub_pos_x;
extern int gui_sub_pos_y;
extern int cfg_read( void );
extern int cfg_write( void );

22
Gui/interface.c
View File

@ -204,14 +204,21 @@ void guiInit( void )
exit( 0 );
}
if ( gui_save_pos )
{
appMPlayer.main.x = gui_main_pos_x;
appMPlayer.main.y = gui_main_pos_y;
appMPlayer.sub.x = gui_sub_pos_x;
appMPlayer.sub.y = gui_sub_pos_y;
}
if (WinID>0)
{
{
appMPlayer.subWindow.Parent=WinID;
appMPlayer.sub.x=0;
appMPlayer.sub.y=0;
}
if (guiWinID>=0)
appMPlayer.mainWindow.Parent=guiWinID;
}
if (guiWinID>=0) appMPlayer.mainWindow.Parent=guiWinID;
wsCreateWindow( &appMPlayer.subWindow,
appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height,
@ -331,6 +338,13 @@ void guiDone( void )
{
mplMainRender=0;
mp_msg( MSGT_GPLAYER,MSGL_V,"[gui] done.\n" );
if ( gui_save_pos )
{
gui_main_pos_x=appMPlayer.mainWindow.X; gui_main_pos_y=appMPlayer.mainWindow.Y;
gui_sub_pos_x=appMPlayer.subWindow.X; gui_sub_pos_y=appMPlayer.subWindow.Y;
}
cfg_write();
wsXDone();
}

1
Gui/mplayer/common.c
View File

@ -15,6 +15,7 @@
#include "../../config.h"
#include "../../help_mp.h"
#include "../../libvo/x11_common.h"
#include "../../libvo/fastmemcpy.h"
#include "../../libmpdemux/stream.h"
#include "../../mixer.h"

2
Gui/mplayer/gtk/mb.c
View File

@ -11,7 +11,7 @@
#include "common.h"
GtkWidget * gtkMessageBoxText;
GtkWidget * MessageBox;
GtkWidget * MessageBox = NULL;
void ShowMessageBox( char * msg )
{

4
Gui/mplayer/gtk/opts.c
View File

@ -69,6 +69,7 @@ static GtkWidget * CBDumpSrt;
static GtkWidget * CBPostprocess;
static GtkWidget * CBCache;
static GtkWidget * CBLoadFullscreen;
static GtkWidget * CBSaveWinPos;
static GtkWidget * CBStopXScreenSaver;
static GtkWidget * CBPlayBar;
@ -352,6 +353,7 @@ void ShowPreferences( void )
// --- 6. page
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVopPP );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),gtkLoadFullscreen );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ),gui_save_pos );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ),gtkShowVideoWindow );
if ( !gtkShowVideoWindow )
{
@ -592,6 +594,7 @@ void prButton( GtkButton * button,gpointer user_data )
// --- 6. page
gtkVopPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) );
gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) );
gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) );
gtkShowVideoWindow=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) );
stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) );
gtkEnablePlayBar=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPlayBar ) );
@ -1195,6 +1198,7 @@ GtkWidget * create_Preferences( void )
CBShowVideoWindow=AddCheckButton( MSGTR_PREFERENCES_ShowVideoWindow,vbox602 );
CBLoadFullscreen=AddCheckButton( MSGTR_PREFERENCES_LoadFullscreen,vbox602 );
CBSaveWinPos=AddCheckButton( MSGTR_PREFERENCES_SaveWinPos,vbox602 );
CBStopXScreenSaver=AddCheckButton( MSGTR_PREFERENCES_XSCREENSAVER,vbox602 );
CBPlayBar=AddCheckButton( MSGTR_PREFERENCES_PlayBar,vbox602 );

1
Gui/mplayer/mw.c
View File

@ -15,6 +15,7 @@
#include "../../config.h"
#include "../../help_mp.h"
#include "../../libvo/x11_common.h"
#include "../../libvo/fastmemcpy.h"
#include "../../libmpdemux/stream.h"
#include "../../mixer.h"

9
Gui/mplayer/pb.c
View File

@ -15,6 +15,7 @@
#include "../../config.h"
#include "../../help_mp.h"
#include "../../libvo/x11_common.h"
#include "../../libvo/fastmemcpy.h"
#include "../../libmpdemux/stream.h"
#include "../../mixer.h"
@ -214,13 +215,13 @@ void mplPBShow( int x, int y )
void mplPBInit( void )
{
gfree( (void**)&mplPBDrawBuffer );
if ( !appMPlayer.barIsPresent ) return;
if ( ( mplPBDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.bar.Bitmap.ImageSize ) ) == NULL )
gfree( (void**)&mplPBDrawBuffer );
if ( ( mplPBDrawBuffer = (unsigned char *)malloc( appMPlayer.bar.Bitmap.ImageSize ) ) == NULL )
{
fprintf( stderr,MSGTR_NEMDB );
mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_NEMDB );
exit( 0 );
}

1
Gui/mplayer/sw.c
View File

@ -5,6 +5,7 @@
#include "../../config.h"
#include "../../libvo/x11_common.h"
#include "../../libvo/fastmemcpy.h"
#include "../app.h"
#include "../interface.h"

2
Gui/skin/font.c
View File

@ -174,7 +174,7 @@ txSample * fntRender( wItem * item,int px,char * fmt,... )
if ( item->Bitmap.Image == NULL )
{
item->Bitmap.Height=item->height=fntTextHeight( id,p );
item->Bitmap.Width=iw;
item->Bitmap.Width=item->width=iw;
item->Bitmap.ImageSize=item->height * iw * 4;
if ( !item->Bitmap.ImageSize ) return NULL;
item->Bitmap.BPP=32;

1
help/help_mp-en.h
View File

@ -585,6 +585,7 @@ static char help_text[]=
#define MSGTR_PREFERENCES_Cache "Cache on/off"
#define MSGTR_PREFERENCES_CacheSize "Cache size: "
#define MSGTR_PREFERENCES_LoadFullscreen "Start in fullscreen"
#define MSGTR_PREFERENCES_SaveWinPos "Save window position"
#define MSGTR_PREFERENCES_XSCREENSAVER "Stop XScreenSaver"
#define MSGTR_PREFERENCES_PlayBar "Enable playbar"
#define MSGTR_PREFERENCES_AutoSync "AutoSync on/off"

1
help/help_mp-hu.h
View File

@ -503,6 +503,7 @@ static char help_text[]=
#define MSGTR_PREFERENCES_Cache "Gyorsítótár be/ki"
#define MSGTR_PREFERENCES_CacheSize "Gyorsítótár merete:"
#define MSGTR_PREFERENCES_LoadFullscreen "Indítás teljes képernyõn"
#define MSGTR_PREFERENCES_SaveWinPos "Ablakok pozíciójának mentése"
#define MSGTR_PREFERENCES_XSCREENSAVER "XScreenSaver leállítása film lejátszásakor"
#define MSGTR_PREFERENCES_PlayBar "PlayBar engedélyezése"
#define MSGTR_PREFERENCES_AutoSync "AutoSync ki/be kapcsolása"