[Mplayer-cvslog] CVS: main/Gui Makefile,1.2,1.3 app.c,1.7,1.8 app.h,1.4,1.5 events.c,1.3,1.4 events.h,1.3,1.4 gui.mak,1.3,1.4 config.c,1.1,NONE config.h,1.1,NONE
Zoltan Ponekker
pontscho at mplayer.dev.hu
Fri Sep 7 23:04:16 CEST 2001
- Previous message: [Mplayer-cvslog] CVS: main cfg-mplayer.h,1.79,1.80
- Next message: [Mplayer-cvslog] CVS: main/Gui/mplayer Makefile,1.1,1.2 mplayer.c,1.10,1.11 play.c,1.27,1.28 psignal.c,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/mplayer/main/Gui
In directory mplayer:/var/tmp.root/cvs-serv8679/Gui
Modified Files:
Makefile app.c app.h events.c events.h gui.mak
Removed Files:
config.c config.h
Log Message:
some bug fix, and add decoration item to skin conffile. faszom(C)
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 2 Sep 2001 17:59:54 -0000 1.2
+++ Makefile 7 Sep 2001 21:04:14 -0000 1.3
@@ -45,7 +45,7 @@
depend: .depend
-.depend: Makefile config.mak config.h gui.mak bitmap/bitmap.mak
+.depend: Makefile config.mak gui.mak bitmap/bitmap.mak
$(MAKE) -C mplayer depend
$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
Index: app.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- app.c 1 Sep 2001 17:53:01 -0000 1.7
+++ app.c 7 Sep 2001 21:04:14 -0000 1.8
@@ -5,20 +5,16 @@
#include "app.h"
#include "../config.h"
-#include "config.h"
#include "error.h"
#include "wm/wskeys.h"
#include "skin/skin.h"
#include "mplayer/mplayer.h"
listItems appMPlayer;
-listItems appTV;
-listItems appRadio;
-//char * appMPlayerDirInHome=NULL;
-//char * appMPlayerDir=NULL;
char * skinDirInHome=NULL;
char * skinMPlayerDir=NULL;
+char * skinName = NULL;
void appClearItem( wItem * item )
{
@@ -71,6 +67,7 @@
memset( item->MenuItems,0,32 * 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;
@@ -104,12 +101,13 @@
skinMPlayerDir=DATADIR "/Skin";
printf("SKIN dir 1: '%s'\n",skinDirInHome);
printf("SKIN dir 2: '%s'\n",skinMPlayerDir);
-
+ if ( !skinName )
+ {
+ if ( ( skinName=(char *)calloc( 1,7 ) ) == NULL ) { dbprintf( 0,"[config] Not enough memory.\n" ); exit( 1 ); }
+ strcpy( skinName,"default" );
+ }
initDebug(NULL); // write messages to stderr
-
- cfgDefaults(); // set skin to "default"
- cfgRead(); // empty function - NOP
- switch ( skinRead( cfgSkin ) )
+ switch ( skinRead( skinName ) )
{
case -1: dbprintf( 0,"[app] skin configfile not found.\n" ); exit( 0 );
case -2: dbprintf( 0,"[app] skin configfile read error.\n" ); exit( 0 );
Index: app.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- app.h 28 Aug 2001 15:53:48 -0000 1.4
+++ app.h 7 Sep 2001 21:04:14 -0000 1.5
@@ -50,6 +50,7 @@
{
wItem main;
wsTWindow mainWindow;
+ int mainDecoration;
wItem sub;
wsTWindow subWindow;
@@ -72,13 +73,10 @@
} listItems;
extern listItems appMPlayer;
-extern listItems appTV;
-extern listItems appRadio;
-//extern char * appMPlayerDirInHome;
-//extern char * appMPlayerDir;
extern char * skinDirInHome;
extern char * skinMPlayerDir;
+extern char * skinName;
extern void appInit( int argc,char* argv[], char *envp[], void* disp );
extern void appInitStruct( listItems * item );
Index: events.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/events.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- events.c 2 Sep 2001 17:59:54 -0000 1.3
+++ events.c 7 Sep 2001 21:04:14 -0000 1.4
@@ -3,44 +3,44 @@
evName evNames[] =
{
- { evNone, "evNone" }, // 1
- { evPlay, "evPlay" }, // 2
- { evStop, "evStop" }, // 3
- { evPause, "evPause" }, // 4
- { evPrev, "evPrev" }, // 7
- { evNext, "evNext" }, // 8
- { evLoad, "evLoad" }, // 9
- { evEqualeaser, "evEqualeaser" }, // 10
- { evPlayList, "evPlaylist" }, // 11
- { evExit, "evExit" }, // 12
- { evPlusVideo, "evPlusVideo" }, // 13
- { evMinusVideo, "evMinusVideo" }, // 14
- { evIconify, "evIconify" }, // 15
- { evPlusBalance, "evPlusBalance" }, // 16
- { evMinusBalance, "evMinusBalance" }, // 17
- { evFullScreen, "evFullScreen" }, // 18
- { evFName, "evFName" }, // 19
- { evMovieTime, "evMovieTime" }, // 20
- { evAbout, "evAbout" }, // 22
- { evLoadPlay, "evLoadPlay" }, // 23
- { evPreferences, "evPreferences" }, // 24
- { evSkinBrowser, "evSkinBrowser" }, // 25
- { evBackward10sec, "evBackward10sec" }, // 26
- { evForward10sec, "evForward10sec" }, // 27
- { evBackward1min, "evBackward1min" }, // 28
- { evForward1min, "evForward1min" }, // 29
- { evIncVolume, "evIncVolume" }, // 30
- { evDecVolume, "evDecVolume" }, // 31
- { evMute, "evMute" }, // 32
- { evIncAudioBufDelay, "evIncAudioBufDelay" }, // 33
- { evDecAudioBufDelay, "evDecAudioBufDelay" }, // 34
- { evPlaySwitchToPause, "evPlaySwitchToPause" }, // 35
- { evPauseSwitchToPlay, "evPauseSwitchToPlay" }, // 36
- { evNormalSize, "evNormalSize" }, // 37
- { evDoubleSize, "evDoubleSize" }, // 38
- { evSetMoviePosition, "evSetMoviePosition" }, // 39
- { evSetVolume, "evSetVolume" }, // 40
- { evSetBalance, "evSetBalance" }, // 41
+ { evNone, "evNone" },
+ { evPlay, "evPlay" },
+ { evStop, "evStop" },
+ { evPause, "evPause" },
+ { evPrev, "evPrev" },
+ { evNext, "evNext" },
+ { evLoad, "evLoad" },
+ { evEqualeaser, "evEqualeaser" },
+ { evPlayList, "evPlaylist" },
+ { evExit, "evExit" },
+ { evIconify, "evIconify" },
+ { evIncBalance, "evIncBalance" },
+ { evDecBalance, "evDecBalance" },
+ { evFullScreen, "evFullScreen" },
+ { evFName, "evFName" },
+ { evMovieTime, "evMovieTime" },
+ { evAbout, "evAbout" },
+ { evLoadPlay, "evLoadPlay" },
+ { evPreferences, "evPreferences" },
+ { evSkinBrowser, "evSkinBrowser" },
+ { evBackward10sec, "evBackward10sec" },
+ { evForward10sec, "evForward10sec" },
+ { evBackward1min, "evBackward1min" },
+ { evForward1min, "evForward1min" },
+ { evBackward10min, "evBackward10min" },
+ { evForward10min, "evForward10min" },
+ { evIncVolume, "evIncVolume" },
+ { evDecVolume, "evDecVolume" },
+ { evMute, "evMute" },
+ { evIncAudioBufDelay, "evIncAudioBufDelay" },
+ { evDecAudioBufDelay, "evDecAudioBufDelay" },
+ { evPlaySwitchToPause, "evPlaySwitchToPause" },
+ { evPauseSwitchToPlay, "evPauseSwitchToPlay" },
+ { evNormalSize, "evNormalSize" },
+ { evDoubleSize, "evDoubleSize" },
+ { evSetMoviePosition, "evSetMoviePosition" },
+ { evSetVolume, "evSetVolume" },
+ { evSetBalance, "evSetBalance" },
{ evHelp, "evHelp" }
};
Index: events.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/events.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- events.h 1 Sep 2001 17:53:01 -0000 1.3
+++ events.h 7 Sep 2001 21:04:14 -0000 1.4
@@ -13,35 +13,38 @@
#define evLoad 8
#define evEqualeaser 9
#define evPlayList 10
-#define evPlusVideo 11
-#define evMinusVideo 12
-#define evIconify 13
-#define evPlusBalance 14
-#define evMinusBalance 15
-#define evFullScreen 16
-#define evAbout 18
-#define evLoadPlay 19
-#define evPreferences 20
-#define evSkinBrowser 21
-#define evBackward10sec 22
-#define evForward10sec 23
-#define evBackward1min 24
-#define evForward1min 25
-#define evIncVolume 26
-#define evDecVolume 27
-#define evMute 28
-#define evIncAudioBufDelay 29
-#define evDecAudioBufDelay 30
-#define evPlaySwitchToPause 31
-#define evPauseSwitchToPlay 32
-#define evNormalSize 33
-#define evDoubleSize 34
+#define evIconify 11
+#define evAbout 12
+#define evLoadPlay 13
+#define evPreferences 14
+#define evSkinBrowser 15
+#define evPlaySwitchToPause 16
+#define evPauseSwitchToPlay 17
-#define evSetMoviePosition 35
-#define evSetVolume 36
-#define evSetBalance 37
+#define evBackward10sec 18
+#define evForward10sec 19
+#define evBackward1min 20
+#define evForward1min 21
+#define evBackward10min 22
+#define evForward10min 23
-#define evHelp 38
+#define evNormalSize 24
+#define evDoubleSize 25
+#define evFullScreen 26
+
+#define evSetMoviePosition 27
+#define evSetVolume 28
+#define evSetBalance 29
+#define evMute 30
+
+#define evIncVolume 31
+#define evDecVolume 32
+#define evIncAudioBufDelay 33
+#define evDecAudioBufDelay 34
+#define evIncBalance 35
+#define evDecBalance 36
+
+#define evHelp 37
#define evExit 1000
Index: gui.mak
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/gui.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gui.mak 6 Sep 2001 09:36:39 -0000 1.3
+++ gui.mak 7 Sep 2001 21:04:14 -0000 1.4
@@ -6,6 +6,6 @@
$(MPLAYERDIR)psignal.c
MPLAYEROBJS = $(MPLAYERSRCS:.c=.o)
-SRCS = $(SKINSRC) $(BITMAPSRCS) wm/ws.c wm/wsconv.c app.c config.c events.c timer.c language.c error.c
+SRCS = $(SKINSRC) $(BITMAPSRCS) wm/ws.c wm/wsconv.c app.c events.c timer.c language.c error.c
OBJS = $(SRCS:.c=.o)
--- config.c DELETED ---
--- config.h DELETED ---
- Previous message: [Mplayer-cvslog] CVS: main cfg-mplayer.h,1.79,1.80
- Next message: [Mplayer-cvslog] CVS: main/Gui/mplayer Makefile,1.1,1.2 mplayer.c,1.10,1.11 play.c,1.27,1.28 psignal.c,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list