[MPlayer-cvslog] r34772 - in trunk/gui: app.h cfg.c interface.c ui/actions.c ui/gtk/equalizer.c ui/gtk/fileselect.c ui/gtk/preferences.c ui/main.c ui/menu.c ui/playbar.c ui/sub.c ui/widgets.c util/bitmap.c util/bit...
ib
subversion at mplayerhq.hu
Fri Feb 24 18:16:54 CET 2012
Author: ib
Date: Fri Feb 24 18:16:54 2012
New Revision: 34772
Log:
Cosmetic: Prefer C style for single line comments.
Additionally, slightly revise some of these comments.
Modified:
trunk/gui/app.h
trunk/gui/cfg.c
trunk/gui/interface.c
trunk/gui/ui/actions.c
trunk/gui/ui/gtk/equalizer.c
trunk/gui/ui/gtk/fileselect.c
trunk/gui/ui/gtk/preferences.c
trunk/gui/ui/main.c
trunk/gui/ui/menu.c
trunk/gui/ui/playbar.c
trunk/gui/ui/sub.c
trunk/gui/ui/widgets.c
trunk/gui/util/bitmap.c
trunk/gui/util/bitmap.h
trunk/gui/util/list.c
trunk/gui/win32/gui.c
trunk/gui/win32/skinload.h
trunk/gui/wm/ws.c
trunk/gui/wm/ws.h
Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/app.h Fri Feb 24 18:16:54 2012 (r34772)
@@ -22,7 +22,7 @@
#include "util/bitmap.h"
#include "wm/ws.h"
-// User events
+/* User events */
#define evNone 0
@@ -73,7 +73,7 @@
#define evIconify 11
#define evExit 1000
-// Internal events
+/* Internal events */
#define ivSetAudio 45
#define ivSetVideo 46
@@ -96,7 +96,7 @@ typedef struct {
const char *name;
} evName;
-// Skin items
+/* Skin items */
#define itNone 0
#define itButton 101
@@ -111,13 +111,13 @@ typedef struct {
#define itPLMButton (itNone - 1)
#define itPRMButton (itNone - 2)
-// Button states
+/* Button states */
#define btnDisabled 0
#define btnReleased 1
#define btnPressed 2
-// Item definition
+/* Item definition */
#define MAX_ITEMS 64
Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/cfg.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -246,7 +246,7 @@ void cfg_read(void)
player_idle_mode = 1; // GUI is in idle mode by default
- // configuration
+ /* configuration */
fname = get_path(gui_configuration);
@@ -268,7 +268,7 @@ void cfg_read(void)
free(fname);
- // playlist
+ /* playlist */
fname = get_path(gui_playlist);
file = fopen(fname, "rt");
@@ -303,7 +303,7 @@ void cfg_read(void)
free(fname);
- // URL list
+ /* URL list */
fname = get_path(gui_urllist);
file = fopen(fname, "rt");
@@ -331,7 +331,7 @@ void cfg_read(void)
free(fname);
- // directory history
+ /* directory history */
fname = get_path(gui_history);
file = fopen(fname, "rt");
@@ -354,7 +354,7 @@ void cfg_write(void)
char *fname;
FILE *file;
- // configuration
+ /* configuration */
fname = get_path(gui_configuration);
file = fopen(fname, "wt+");
@@ -388,7 +388,7 @@ void cfg_write(void)
free(fname);
- // playlist
+ /* playlist */
fname = get_path(gui_playlist);
file = fopen(fname, "wt+");
@@ -410,7 +410,7 @@ void cfg_write(void)
free(fname);
- // URL list
+ /* URL list */
fname = get_path(gui_urllist);
file = fopen(fname, "wt+");
@@ -430,7 +430,7 @@ void cfg_write(void)
free(fname);
- // directory history
+ /* directory history */
fname = get_path(gui_history);
file = fopen(fname, "wt+");
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/interface.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -97,10 +97,10 @@ void guiInit(void)
gtkInit();
- // initialize X
+ /* initialize X */
wsXInit(mDisplay);
- // load skin
+ /* load skin */
skinDirInHome = get_path("skins");
skinMPlayerDir = MPLAYER_DATADIR "/skins";
@@ -130,7 +130,7 @@ void guiInit(void)
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
- // initialize windows
+ /* initialize windows */
mainDrawBuffer = malloc(guiApp.main.Bitmap.ImageSize);
@@ -445,7 +445,7 @@ int gui(int what, void *data)
break;
}
- // video opts
+ /* video opts */
if (!video_driver_list) {
int i = 0;
@@ -486,7 +486,7 @@ int gui(int what, void *data)
if (gtkVfPP)
add_vf("pp");
- // audio opts
+ /* audio opts */
// if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; }
if (gtkAONorm)
@@ -555,7 +555,7 @@ int gui(int what, void *data)
}
}
- // subtitle
+ /* subtitle */
// subdata->filename=gstrdup( guiInfo.SubtitleFilename );
stream_dump_type = 0;
@@ -569,7 +569,7 @@ int gui(int what, void *data)
gtkSubDumpMPSub = gtkSubDumpSrt = 0;
mplayerLoadFont();
- // misc
+ /* misc */
if (gtkCacheOn)
stream_cache_size = gtkCacheSize;
@@ -641,7 +641,7 @@ int gui(int what, void *data)
case GUI_SET_VIDEO:
- // video
+ /* video */
guiInfo.sh_video = data;
@@ -875,7 +875,7 @@ int guiPlaylistInitialize(play_tree_t *m
if ((my_pt_iter = pt_iter_create(&my_playtree, config))) {
while ((filename = pt_iter_get_next_file(my_pt_iter)) != NULL)
- // add it to end of list
+ /* add it to end of list */
if (import_file_into_gui(filename, 0))
result = 1;
}
@@ -904,7 +904,7 @@ int guiPlaylistAdd(play_tree_t *my_playt
if ((my_pt_iter = pt_iter_create(&my_playtree, config))) {
while ((filename = pt_iter_get_next_file(my_pt_iter)) != NULL)
- // insert it into the list and set plCurrent=new item
+ /* insert it into the list and set plCurrent=new item */
if (import_file_into_gui(filename, 1))
result = 1;
@@ -931,7 +931,7 @@ void mplayer(int what, float value, void
equalizer_t *eq = (equalizer_t *)data;
switch (what) {
- // subtitle
+ /* subtitle */
case MPLAYER_SET_FONT_FACTOR:
font_factor = value;
@@ -997,7 +997,7 @@ void mplayer(int what, float value, void
auto_quality = (int)value;
break;
- // set equalizers
+ /* set equalizers */
case MPLAYER_SET_CONTRAST:
if (guiInfo.sh_video)
Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/ui/actions.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -135,7 +135,7 @@ void uiChangeSkin(char *name)
}
}
- // reload menu window
+ /* reload menu window */
if (prev && guiApp.menuIsPresent) {
free(menuDrawBuffer);
@@ -153,7 +153,7 @@ void uiChangeSkin(char *name)
} else
uiMenuInit();
- // reload sub window
+ /* reload sub window */
if (guiApp.sub.Bitmap.Image)
wsResizeImage(&guiApp.subWindow, guiApp.sub.Bitmap.Width, guiApp.sub.Bitmap.Height);
@@ -173,14 +173,14 @@ void uiChangeSkin(char *name)
wsPostRedisplay(&guiApp.subWindow);
}
- // reload playbar
+ /* reload playbar */
if (bprev)
wsDestroyWindow(&guiApp.playbarWindow);
uiPlaybarInit();
- // reload main window
+ /* reload main window */
free(mainDrawBuffer);
mainDrawBuffer = calloc(1, guiApp.main.Bitmap.ImageSize);
Modified: trunk/gui/ui/gtk/equalizer.c
==============================================================================
--- trunk/gui/ui/gtk/equalizer.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/ui/gtk/equalizer.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -501,7 +501,7 @@ GtkWidget * create_Equalizer( void )
return Equalizer;
}
-// --- equalizer config dialog box
+/* equalizer config dialog box */
static GtkWidget * CBChannel1;
static GtkWidget * CEChannel1;
Modified: trunk/gui/ui/gtk/fileselect.c
==============================================================================
--- trunk/gui/ui/gtk/fileselect.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/ui/gtk/fileselect.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -396,7 +396,7 @@ static void fs_PersistantHistory( char *
for ( i=FF_ARRAY_ELEMS(fsHistory) - 1;i;i-- ) fsHistory[i]=fsHistory[i - 1];
fsHistory[0]=gstrdup( subject );
}
-//-----------------------------------------------
+/* ----------------------------------------------- */
static void fs_fsFilterCombo_activate( GtkEntry * entry,
gpointer user_data )
Modified: trunk/gui/ui/gtk/preferences.c
==============================================================================
--- trunk/gui/ui/gtk/preferences.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/ui/gtk/preferences.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -51,7 +51,7 @@
#include "fileselect.h"
#include "tools.h"
-// for mpcodecs_[av]d_drivers:
+/* for mpcodecs_[av]d_drivers: */
#include "libmpcodecs/vd.h"
#include "libmpcodecs/ad.h"
@@ -201,7 +201,7 @@ void ShowPreferences( void )
if ( Preferences ) gtkActive( Preferences );
else Preferences=create_Preferences();
-// -- 1. page
+/* 1st page */
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ),gtkEnableAudioEqualizer );
#if 0
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSurround ),gtkAOSurround );
@@ -242,7 +242,7 @@ void ShowPreferences( void )
}
}
-// -- 2. page
+/* 2nd page */
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ),vo_doublebuffering );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDR ),vo_directrendering );
@@ -280,7 +280,7 @@ void ShowPreferences( void )
gtk_adjustment_set_value( HSFPSadj,force_fps );
-// -- 3. page
+/* 3rd page */
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSubOverlap ),suboverlap_enabled );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ),!sub_auto );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ),gtkSubDumpMPSub );
@@ -324,8 +324,8 @@ void ShowPreferences( void )
}
#endif
-// --- 4. page
- // font ...
+/* 4th page */
+ /* font ... */
if ( font_name ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),font_name );
#ifndef CONFIG_FREETYPE
gtk_adjustment_set_value( HSFontFactoradj,font_factor );
@@ -350,7 +350,7 @@ void ShowPreferences( void )
}
#endif
-// -- 5. page
+/* 5th page */
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNonInterlaved ),force_ni );
if ( index_mode == 1 ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBIndex ),1 );
{
@@ -385,7 +385,7 @@ void ShowPreferences( void )
if ( name ) gtk_entry_set_text( GTK_ENTRY( EAFM ),name );
}
-// --- 6. page
+/* 6th page */
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVfPP );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),gtkLoadFullscreen );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ),gui_save_pos );
@@ -416,7 +416,7 @@ void ShowPreferences( void )
if ( cdrom_device ) gtk_entry_set_text( GTK_ENTRY( prECDRomDevice ),cdrom_device );
else gtk_entry_set_text( GTK_ENTRY( prECDRomDevice ),DEFAULT_CDROM_DEVICE );
-// -- disables
+/* disables */
#ifndef CONFIG_ASS
gtk_widget_set_sensitive( CBUseASS,FALSE );
gtk_widget_set_sensitive( CBASSUseMargins,FALSE );
@@ -424,7 +424,7 @@ void ShowPreferences( void )
gtk_widget_set_sensitive( SBASSBottomMargin,FALSE );
#endif
-// -- signals
+/* signals */
gtk_signal_connect( GTK_OBJECT( CBExtraStereo ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)0 );
gtk_signal_connect( GTK_OBJECT( CBNormalize ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)1 );
gtk_signal_connect( GTK_OBJECT( CBSoftwareMixer ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)1 );
@@ -529,7 +529,7 @@ static void prButton( GtkButton * button
switch ( (int)user_data )
{
case bOk:
- // -- 1. page
+ /* 1st page */
gtkEnableAudioEqualizer=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ) );
gtkAOExtraStereo=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBExtraStereo ) );
gtkAONorm=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNormalize ) );
@@ -540,7 +540,7 @@ static void prButton( GtkButton * button
listSet( &audio_driver_list,ao_driver[0] );
listSet( &video_driver_list,vo_driver[0] );
- // -- 2. page
+ /* 2nd page */
vo_doublebuffering=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ) );
vo_directrendering=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDR ) );
@@ -553,7 +553,7 @@ static void prButton( GtkButton * button
force_fps=HSFPSadj->value;
- // -- 3. page
+ /* 3rd page */
suboverlap_enabled=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubOverlap ) );
sub_auto=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) );
gtkSubDumpMPSub=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ) );
@@ -574,7 +574,7 @@ static void prButton( GtkButton * button
if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDTPTT ) ) ) osd_level=3;
- // --- 4. page
+ /* 4th page */
setdup( &font_name,gtk_entry_get_text( GTK_ENTRY( prEFontName ) ) );
#ifndef CONFIG_FREETYPE
mplayer( MPLAYER_SET_FONT_FACTOR,HSFontFactoradj->value,0 );
@@ -589,7 +589,7 @@ static void prButton( GtkButton * button
if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleDiagonal ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,3,0 );
#endif
- // -- 5. page
+ /* -- 5th page */
force_ni=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNonInterlaved ) );
index_mode=-1;
if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBIndex ) ) ) index_mode=1;
@@ -610,7 +610,7 @@ static void prButton( GtkButton * button
{ listSet( &audio_fm_list,(char *)mpcodecs_ad_drivers[i]->info->short_name ); break; }
}
- // --- 6. page
+ /* 6th page */
gtkVfPP=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 ) );
@@ -857,7 +857,7 @@ GtkWidget * create_Preferences( void )
frame=AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,1 );
frame=AddFrame( NULL,GTK_SHADOW_NONE,frame,1 );
-// --- 1. page
+/* 1st page */
vbox2=AddVBox( frame,0 );
@@ -910,7 +910,7 @@ GtkWidget * create_Preferences( void )
label=AddLabel( MSGTR_PREFERENCES_Audio,NULL );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),0 ),label );
-// --- 2. page
+/* 2nd page */
hbox2=AddVBox( notebook1,0 );
@@ -975,7 +975,7 @@ GtkWidget * create_Preferences( void )
label=AddLabel( MSGTR_PREFERENCES_Video,NULL );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),1 ),label );
-// --- 3. page
+/* 3rd page */
vbox6=AddVBox( notebook1,0 );
@@ -1094,7 +1094,7 @@ GtkWidget * create_Preferences( void )
gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),2 ),label );
vbox601=AddVBox( notebook1,0 );
-// --- 4. page
+/* 4th page */
vbox603=AddVBox(
AddFrame( NULL,GTK_SHADOW_NONE,
@@ -1178,7 +1178,7 @@ GtkWidget * create_Preferences( void )
label=AddLabel( MSGTR_PREFERENCES_FRAME_Font,NULL );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),3 ),label );
-// --- 5. page
+/* 5th page */
vbox601=AddVBox( notebook1,0 );
@@ -1222,7 +1222,7 @@ GtkWidget * create_Preferences( void )
vbox601=AddVBox( notebook1,0 );
-// --- 6. page
+/* 6th page */
vbox602=AddVBox(
AddFrame( NULL,GTK_SHADOW_NONE,
@@ -1300,7 +1300,7 @@ GtkWidget * create_Preferences( void )
label=AddLabel( MSGTR_PREFERENCES_Misc,NULL );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),5 ),label );
-// ---
+/* --- */
AddHSeparator( vbox1 );
@@ -1370,7 +1370,7 @@ GtkWidget * create_Preferences( void )
#ifdef CONFIG_OSS_AUDIO
static GList *appendOSSDevices(GList *l)
{
- // careful! the current implementation allows only string constants!
+ /* careful! the current implementation allows only string constants! */
l = g_list_append(l, (gpointer)"/dev/dsp");
if (gtkAOOSSDevice && strncmp(gtkAOOSSDevice, "/dev/sound", 10) == 0) {
l = g_list_append(l, (gpointer)"/dev/sound/dsp0");
@@ -1395,7 +1395,7 @@ static GList *appendOSSDevices(GList *l)
static GList *appendOSSMixers(GList *l)
{
- // careful! the current implementation allows only string constants!
+ /* careful! the current implementation allows only string constants! */
l = g_list_append(l, (gpointer)"/dev/mixer");
if (gtkAOOSSMixer && strncmp(gtkAOOSSMixer, "/dev/sound", 10) == 0) {
l = g_list_append(l, (gpointer)"/dev/sound/mixer0");
@@ -1706,7 +1706,7 @@ GtkWidget *create_AudioConfig( void ) {
return AudioConfig;
}
-// --- dxr3 config box
+/* dxr3 config box */
static GtkWidget * DXR3Config;
static GtkWidget * CBDevice;
Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/ui/main.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -135,7 +135,7 @@ void uiEventHandling( int msg,float para
switch( msg )
{
-// --- user events
+/* user events */
case evExit:
mplayer( MPLAYER_EXIT_GUI, EXIT_QUIT, 0 );
break;
@@ -406,7 +406,7 @@ set_volume:
guiInfo.NewPlay=GUI_FILE_NEW;
break;
-// --- timer events
+/* timer events */
case ivRedraw:
{
unsigned now = GetTimerMS();
@@ -420,7 +420,7 @@ set_volume:
wsPostRedisplay( &guiApp.mainWindow );
wsPostRedisplay( &guiApp.playbarWindow );
break;
-// --- system events
+/* system events */
case evNone:
mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] uiEventHandling: evNone\n" );
break;
@@ -507,7 +507,7 @@ void uiMainMouseHandle( int Button,int X
gtkShow( ivShowPopUpMenu,NULL );
break;
-// --- rolled mouse ... de szar :)))
+/* rolled mouse ... de szar :))) */
case wsP5MouseButton: value=-2.5f; goto rollerhandled;
case wsP4MouseButton: value= 2.5f;
rollerhandled:
@@ -520,7 +520,7 @@ rollerhandled:
}
break;
-// --- moving
+/* moving */
case wsMoveMouse:
item=&guiApp.mainItems[SelectedItem];
switch ( itemtype )
Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/ui/menu.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -48,7 +48,7 @@ static void uiMenuDraw( void )
if ( menuRender || menuItem != oldMenuItem )
{
memcpy( menuDrawBuffer,guiApp.menu.Bitmap.Image,guiApp.menu.Bitmap.ImageSize );
-// ---
+/* --- */
if ( menuItem != -1 )
{
buf=(uint32_t *)menuDrawBuffer;
@@ -61,7 +61,7 @@ static void uiMenuDraw( void )
}
}
oldMenuItem=menuItem;
-// ---
+/* --- */
wsConvert( &guiApp.menuWindow,menuDrawBuffer );
menuRender=0;
}
Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/ui/playbar.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -99,7 +99,7 @@ static void uiPlaybarDraw( void )
break;
}
-// --- render
+/* render */
if ( guiApp.playbarWindow.State == wsWindowExpose )
{
btnModify( evSetMoviePosition,guiInfo.Position );
@@ -141,7 +141,7 @@ static void uiPlaybarMouseHandle( int Bu
case wsRRMouseButton:
gtkShow( ivShowPopUpMenu,NULL );
break;
-// ---
+/* --- */
case wsPLMouseButton:
gtkShow( ivHidePopUpMenu,NULL );
SelectedItem=currentselected;
@@ -189,7 +189,7 @@ static void uiPlaybarMouseHandle( int Bu
itemtype=0;
break;
-// ---
+/* --- */
case wsP5MouseButton: value=-2.5f; goto rollerhandled;
case wsP4MouseButton: value= 2.5f;
rollerhandled:
@@ -201,7 +201,7 @@ rollerhandled:
uiEventHandling( item->message,item->value );
}
break;
-// ---
+/* --- */
case wsMoveMouse:
item=&guiApp.playbarItems[SelectedItem];
switch ( itemtype )
Modified: trunk/gui/ui/sub.c
==============================================================================
--- trunk/gui/ui/sub.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/ui/sub.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -73,7 +73,7 @@ void uiSubMouseHandle( int Button,int X,
uiHideMenu( RX,RY,1 );
msButton=0;
break;
-// ---
+/* --- */
case wsPLMouseButton:
gtkShow( ivHidePopUpMenu,NULL );
sx=X; sy=Y;
Modified: trunk/gui/ui/widgets.c
==============================================================================
--- trunk/gui/ui/widgets.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/ui/widgets.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -69,7 +69,7 @@ static const char gui_icon_name[] = "mpl
#define THRESHOLD 128 // transparency values equal to or above this will become
// opaque, all values below this will become transparent
-// --- init & close gtk
+/* init & close gtk */
guiIcon_t guiIcon;
@@ -107,7 +107,7 @@ static void gtkLoadIcon(GtkIconTheme *th
} else
mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_ICONERROR, gui_icon_name, size);
- // start up GTK which realizes the pixmaps
+ /* start up GTK which realizes the pixmaps */
gtk_main_iteration_do(FALSE);
}
@@ -190,7 +190,7 @@ void gtkEventHandling(void)
gtk_main_iteration_do(0);
}
-// --- funcs
+/* funcs */
void gtkMessageBox(int type, const gchar *str)
{
Modified: trunk/gui/util/bitmap.c
==============================================================================
--- trunk/gui/util/bitmap.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/util/bitmap.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -94,7 +94,7 @@ static int pngRead(const char *fname, gu
av_init_packet(&pkt);
pkt.data = data;
pkt.size = len;
- // HACK: make PNGs decode normally instead of as CorePNG delta frames
+ /* HACK: Make PNGs decode normally instead of as CorePNG delta frames. */
pkt.flags = AV_PKT_FLAG_KEY;
avcodec_decode_video2(avctx, frame, &decode_ok, &pkt);
Modified: trunk/gui/util/bitmap.h
==============================================================================
--- trunk/gui/util/bitmap.h Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/util/bitmap.h Fri Feb 24 18:16:54 2012 (r34772)
@@ -26,7 +26,7 @@
#define GUI_TRANSPARENT 0xffff00ff
#define ALPHA_OPAQUE 0xff000000
-// for legacy reasons, we must treat all kind of fuchsia/magenta as transparent
+/* for legacy reasons, we must treat all kind of fuchsia/magenta as transparent */
#define IS_TRANSPARENT(c) ((ALPHA_OPAQUE | (c)) == GUI_TRANSPARENT)
typedef struct {
Modified: trunk/gui/util/list.c
==============================================================================
--- trunk/gui/util/list.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/util/list.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -49,7 +49,7 @@ void *listMgr(int cmd, void *data)
urlItem *udat = (urlItem *)data;
switch (cmd) {
- // playlist
+ /* playlist */
case PLAYLIST_GET:
@@ -154,7 +154,7 @@ void *listMgr(int cmd, void *data)
plCurrent = NULL;
return NULL;
- // url list
+ /* URL list */
case URLLIST_GET:
Modified: trunk/gui/win32/gui.c
==============================================================================
--- trunk/gui/win32/gui.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/win32/gui.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -48,7 +48,7 @@
#include "dialogs.h"
#include "version.h"
-// HACK around bug in old mingw
+/* HACK around bug in old mingw */
#undef INVALID_FILE_ATTRIBUTES
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
Modified: trunk/gui/win32/skinload.h
==============================================================================
--- trunk/gui/win32/skinload.h Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/win32/skinload.h Fri Feb 24 18:16:54 2012 (r34772)
@@ -112,7 +112,7 @@ struct skin_t
skin_t *loadskin(char *skindir, int desktopbpp);
-// --- Widget types ---
+/* --- Widget types --- */
#define tyBase 1
#define tyButton 2
@@ -123,14 +123,14 @@ skin_t *loadskin(char *skindir, int desk
#define tySlabel 7
#define tyDlabel 8
-// --- Window types ---
+/* --- Window types --- */
#define wiMain 1
#define wiSub 2
#define wiMenu 3
#define wiPlaybar 4
-// --- User events ------
+/* --- User events --- */
#define evNone 0
#define evPlay 1
@@ -180,7 +180,7 @@ skin_t *loadskin(char *skindir, int desk
#define evIconify 11
#define evExit 1000
-// --- Internal events ---
+/* --- Internal events --- */
#define ivSetAudio 45
#define ivSetVideo 46
Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/wm/ws.c Fri Feb 24 18:16:54 2012 (r34772)
@@ -121,7 +121,7 @@ static int wsSearch(Window win)
return -1;
}
-// ---
+/* --- */
#define PACK_RGB16(r, g, b, pixel) pixel = (b >> 3); \
pixel <<= 6; \
@@ -138,7 +138,7 @@ static int wsSearch(Window win)
struct SwsContext *sws_ctx = NULL;
enum PixelFormat out_pix_fmt = PIX_FMT_NONE;
-// ---
+/* --- */
#define MWM_HINTS_FUNCTIONS (1L << 0)
#define MWM_HINTS_DECORATIONS (1L << 1)
@@ -452,9 +452,9 @@ void wsCreateWindow(wsTWindow *win, int
win->OldWidth = win->Width;
win->OldHeight = win->Height;
-// Border size for window.
+/* Border size for window. */
win->BorderWidth = bW;
-// Hide Mouse Cursor
+/* Hide Mouse Cursor */
win->wsCursor = None;
win->wsMouseEventType = cV;
win->wsCursorData[0] = 0;
@@ -472,7 +472,7 @@ void wsCreateWindow(wsTWindow *win, int
XMatchVisualInfo(wsDisplay, wsScreen, depth, TrueColor, &win->VisualInfo);
-// ---
+/* --- */
win->AtomLeaderClient = XInternAtom(wsDisplay, "WM_CLIENT_LEADER", False);
win->AtomDeleteWindow = XInternAtom(wsDisplay, "WM_DELETE_WINDOW", False);
win->AtomTakeFocus = XInternAtom(wsDisplay, "WM_TAKE_FOCUS", False);
@@ -483,7 +483,7 @@ void wsCreateWindow(wsTWindow *win, int
win->AtomsProtocols[0] = win->AtomDeleteWindow;
win->AtomsProtocols[1] = win->AtomTakeFocus;
win->AtomsProtocols[2] = win->AtomRolle;
-// ---
+/* --- */
win->WindowAttrib.background_pixel = BlackPixel(wsDisplay, wsScreen);
win->WindowAttrib.border_pixel = WhitePixel(wsDisplay, wsScreen);
@@ -582,7 +582,7 @@ void wsCreateWindow(wsTWindow *win, int
XMapWindow(wsDisplay, win->WindowID);
wsCreateImage(win, win->Width, win->Height);
-// --- End of creating --------------------------------------------------------------------------
+/* End of creating -------------------------------------------------------------------------- */
{
int i;
@@ -904,7 +904,7 @@ buttonreleased:
void wsHandleEvents(void)
{
- // handle pending events
+ /* handle pending events */
while (XPending(wsDisplay)) {
XNextEvent(wsDisplay, &wsEvent);
// printf("### X event: %d [%d]\n",wsEvent.type,delay);
@@ -922,7 +922,7 @@ void wsMainLoop(void)
// XIfEvent( wsDisplay,&wsEvent,wsEvents );
while (wsTrue) {
- // handle pending events
+ /* handle pending events */
while (XPending(wsDisplay)) {
XNextEvent(wsDisplay, &wsEvent);
wsEvents(wsDisplay, &wsEvent);
Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h Thu Feb 23 14:48:58 2012 (r34771)
+++ trunk/gui/wm/ws.h Fri Feb 24 18:16:54 2012 (r34772)
@@ -148,7 +148,7 @@ typedef struct {
int Control;
int NumLock;
int CapsLock;
-// --- Misc -------------------------------------------------------------------------------------
+/* Misc ------------------------------------------------------------------------------------- */
Atom AtomDeleteWindow;
Atom AtomTakeFocus;
More information about the MPlayer-cvslog
mailing list