summaryrefslogtreecommitdiffstats
path: root/gui/mplayer/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gui/mplayer/gtk')
-rw-r--r--gui/mplayer/gtk/about.c2
-rw-r--r--gui/mplayer/gtk/eq.c5
-rw-r--r--gui/mplayer/gtk/fs.c33
-rw-r--r--gui/mplayer/gtk/gtk_menu.c4
-rw-r--r--gui/mplayer/gtk/gtk_url.c2
-rw-r--r--gui/mplayer/gtk/opts.c34
-rw-r--r--gui/mplayer/gtk/sb.c2
7 files changed, 49 insertions, 33 deletions
diff --git a/gui/mplayer/gtk/about.c b/gui/mplayer/gtk/about.c
index ea3adf0717..e941ca908b 100644
--- a/gui/mplayer/gtk/about.c
+++ b/gui/mplayer/gtk/about.c
@@ -34,7 +34,7 @@ void ShowAboutBox( void )
gtk_widget_show( About );
}
-void abWidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer )
+static void abWidgetDestroy( GtkWidget * widget, GtkWidget ** widget_pointer )
{ WidgetDestroy( NULL,&About ); }
GtkWidget * create_About( void )
diff --git a/gui/mplayer/gtk/eq.c b/gui/mplayer/gtk/eq.c
index a344e741ab..62b297a31e 100644
--- a/gui/mplayer/gtk/eq.c
+++ b/gui/mplayer/gtk/eq.c
@@ -165,7 +165,7 @@ void ShowEqualizer( void )
gtk_widget_show( Equalizer );
}
-void HideEqualizer( void )
+static void HideEqualizer( void )
{
if ( !Equalizer ) return;
gtk_widget_hide( Equalizer );
@@ -261,7 +261,8 @@ static void eqSelectChannelsListRow( GtkCList * clist,gint row,gint column,GdkEv
}
}
-void eqNotebook( GtkNotebook * notebook,GtkNotebookPage * page,gint page_num,gpointer user_data )
+static void eqNotebook( GtkNotebook * notebook, GtkNotebookPage * page,
+ gint page_num, gpointer user_data )
{
if ( page_num ) gtk_widget_hide( Config );
else gtk_widget_show( Config );
diff --git a/gui/mplayer/gtk/fs.c b/gui/mplayer/gtk/fs.c
index 238697e985..d23cfd1abe 100644
--- a/gui/mplayer/gtk/fs.c
+++ b/gui/mplayer/gtk/fs.c
@@ -177,7 +177,7 @@ static void clist_append_fname(GtkWidget * list, char *fname,
gtk_clist_set_pixmap(GTK_CLIST(list), pos, 0, pixmap, mask);
}
-void CheckDir( GtkWidget * list,char * directory )
+static void CheckDir( GtkWidget * list,char * directory )
{
struct stat fs;
int i;
@@ -229,8 +229,6 @@ void CheckDir( GtkWidget * list,char * directory )
gtk_widget_show( list );
}
-void fs_PersistantHistory( char *subject ); /* forward declaration */
-
void ShowFileSelect( int type,int modal )
{
int i, k;
@@ -346,7 +344,7 @@ void HideFileSelect( void )
fsFileSelect=NULL;
}
-void fs_PersistantHistory( char * subject )
+static void fs_PersistantHistory( char * subject )
{
int i;
@@ -364,13 +362,15 @@ void fs_PersistantHistory( char * subject )
}
//-----------------------------------------------
-void fs_fsFilterCombo_activate( GtkEditable * editable,gpointer user_data )
+static void fs_fsFilterCombo_activate( GtkEditable * editable,
+ gpointer user_data )
{
fsFilter=gtk_entry_get_text( GTK_ENTRY( user_data ) );
CheckDir( fsFNameList,get_current_dir_name() );
}
-void fs_fsFilterCombo_changed( GtkEditable * editable,gpointer user_data )
+static void fs_fsFilterCombo_changed( GtkEditable * editable,
+ gpointer user_data )
{
const char * str;
int i;
@@ -409,7 +409,8 @@ void fs_fsFilterCombo_changed( GtkEditable * editable,gpointer user_data )
CheckDir( fsFNameList,get_current_dir_name() );
}
-void fs_fsPathCombo_activate( GtkEditable * editable,gpointer user_data )
+static void fs_fsPathCombo_activate( GtkEditable * editable,
+ gpointer user_data )
{
const unsigned char * str;
@@ -417,7 +418,8 @@ void fs_fsPathCombo_activate( GtkEditable * editable,gpointer user_data )
if ( chdir( str ) != -1 ) CheckDir( fsFNameList,get_current_dir_name() );
}
-void fs_fsPathCombo_changed( GtkEditable * editable,gpointer user_data )
+static void fs_fsPathCombo_changed( GtkEditable * editable,
+ gpointer user_data )
{
const unsigned char * str;
@@ -425,7 +427,7 @@ void fs_fsPathCombo_changed( GtkEditable * editable,gpointer user_data )
if ( chdir( str ) != -1 ) CheckDir( fsFNameList,get_current_dir_name() );
}
-void fs_Up_released( GtkButton * button,gpointer user_data )
+static void fs_Up_released( GtkButton * button, gpointer user_data )
{
chdir( ".." );
fsSelectedFile=fsThatDir;
@@ -434,7 +436,7 @@ void fs_Up_released( GtkButton * button,gpointer user_data )
return;
}
-int fsFileExist( unsigned char * fname )
+static int fsFileExist( unsigned char * fname )
{
FILE * f = fopen( fname,"r" );
if ( f == NULL ) return 0;
@@ -442,7 +444,7 @@ int fsFileExist( unsigned char * fname )
return 1;
}
-void fs_Ok_released( GtkButton * button,gpointer user_data )
+static void fs_Ok_released( GtkButton * button, gpointer user_data )
{
GList * item;
int i = 1;
@@ -499,19 +501,22 @@ void fs_Ok_released( GtkButton * button,gpointer user_data )
else guiGetEvent( guiCEvent,guiSetStop );
}
-void fs_Cancel_released( GtkButton * button,gpointer user_data )
+static void fs_Cancel_released( GtkButton * button,gpointer user_data )
{
HideFileSelect();
fs_PersistantHistory( get_current_dir_name() ); //totem, write into history file
}
-void fs_fsFNameList_select_row( GtkWidget * widget,gint row,gint column,GdkEventButton *bevent,gpointer user_data )
+static void fs_fsFNameList_select_row( GtkWidget * widget, gint row, gint column,
+ GdkEventButton *bevent, gpointer user_data)
{
gtk_clist_get_text( GTK_CLIST(widget ),row,1,&fsSelectedFile );
if( bevent && bevent->type == GDK_BUTTON_PRESS ) gtk_button_released( GTK_BUTTON( fsOk ) );
}
-gboolean on_FileSelect_key_release_event( GtkWidget * widget,GdkEventKey * event,gpointer user_data )
+static gboolean on_FileSelect_key_release_event( GtkWidget * widget,
+ GdkEventKey * event,
+ gpointer user_data )
{
switch ( event->keyval )
{
diff --git a/gui/mplayer/gtk/gtk_menu.c b/gui/mplayer/gtk/gtk_menu.c
index 14387f84ca..80b63b3e4b 100644
--- a/gui/mplayer/gtk/gtk_menu.c
+++ b/gui/mplayer/gtk/gtk_menu.c
@@ -77,7 +77,7 @@
#include "gui/mplayer/pixmaps/playvcd.xpm"
#endif
-void ActivateMenuItem( int Item )
+static void ActivateMenuItem( int Item )
{
// fprintf( stderr,"[menu] item: %d.%d\n",Item&0xffff,Item>>16 );
gtkPopupMenu=Item & 0x0000ffff;
@@ -384,7 +384,7 @@ static char * ChannelNumbers[] =
{ "","Stereo","","","","5.1" };
#endif
-const char * GetLanguage( int language )
+static const char * GetLanguage( int language )
{
unsigned int i;
for ( i=0;i<sizeof( Languages ) / sizeof( Languages_t );i++ )
diff --git a/gui/mplayer/gtk/gtk_url.c b/gui/mplayer/gtk/gtk_url.c
index 4899e801b1..0b19e96e9b 100644
--- a/gui/mplayer/gtk/gtk_url.c
+++ b/gui/mplayer/gtk/gtk_url.c
@@ -66,7 +66,7 @@ void ShowURLDialogBox( void )
gtk_widget_show( URL );
}
-void HideURLDialogBox( void )
+static void HideURLDialogBox( void )
{
if ( !URL ) return;
gtk_widget_hide( URL );
diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index a1c8d226f3..e4d491e60d 100644
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@@ -480,7 +480,7 @@ void ShowPreferences( void )
}
}
-void HidePreferences( void )
+static void HidePreferences( void )
{
if ( !Preferences ) return;
gtk_widget_hide( Preferences );
@@ -528,7 +528,7 @@ static void prEntry( GtkContainer * container,gpointer user_data )
#define bLSubtitle 4
#define bLFont 5
-void prButton( GtkButton * button,gpointer user_data )
+static void prButton( GtkButton * button, gpointer user_data )
{
switch ( (int)user_data )
{
@@ -1374,7 +1374,8 @@ GtkWidget * create_Preferences( void )
}
#ifdef CONFIG_OSS_AUDIO
-GList *appendOSSDevices(GList *l) {
+static GList *appendOSSDevices(GList *l)
+{
// careful! the current implementation allows only string constants!
l = g_list_append(l, (gpointer)"/dev/dsp");
if (gtkAOOSSDevice && strncmp(gtkAOOSSDevice, "/dev/sound", 10) == 0) {
@@ -1398,7 +1399,8 @@ GList *appendOSSDevices(GList *l) {
return l;
}
-GList *appendOSSMixers(GList *l) {
+static GList *appendOSSMixers(GList *l)
+{
// careful! the current implementation allows only string constants!
l = g_list_append(l, (gpointer)"/dev/mixer");
if (gtkAOOSSMixer && strncmp(gtkAOOSSMixer, "/dev/sound", 10) == 0) {
@@ -1415,7 +1417,8 @@ GList *appendOSSMixers(GList *l) {
return l;
}
-GList *appendOSSMixerChannels(GList *l) {
+static GList *appendOSSMixerChannels(GList *l)
+{
l = g_list_append(l, (gpointer)"vol");
l = g_list_append(l, (gpointer)"pcm");
l = g_list_append(l, (gpointer)"line");
@@ -1424,7 +1427,8 @@ GList *appendOSSMixerChannels(GList *l) {
#endif
#ifdef CONFIG_ALSA
-GList *appendALSADevices(GList *l) {
+static GList *appendALSADevices(GList *l)
+{
l = g_list_append(l, (gpointer)"default");
l = g_list_append(l, (gpointer)"hw=0.0");
l = g_list_append(l, (gpointer)"hw=0.1");
@@ -1436,12 +1440,14 @@ GList *appendALSADevices(GList *l) {
return l;
}
-GList *appendALSAMixers(GList *l) {
+static GList *appendALSAMixers(GList *l)
+{
l = g_list_append(l, (gpointer)"default");
return l;
}
-GList *appendALSAMixerChannels(GList *l) {
+static GList *appendALSAMixerChannels(GList *l)
+{
l = g_list_append(l, (gpointer)"Master");
l = g_list_append(l, (gpointer)"Line");
l = g_list_append(l, (gpointer)"PCM");
@@ -1451,7 +1457,8 @@ GList *appendALSAMixerChannels(GList *l) {
#endif
#ifdef CONFIG_SDL
-GList *appendSDLDevices(GList *l) {
+static GList *appendSDLDevices(GList *l)
+{
l = g_list_append(l, (gpointer)"alsa");
l = g_list_append(l, (gpointer)"arts");
l = g_list_append(l, (gpointer)"esd");
@@ -1463,7 +1470,8 @@ GList *appendSDLDevices(GList *l) {
#endif
#ifdef CONFIG_ESD
-GList *appendESDDevices(GList *l) {
+static GList *appendESDDevices(GList *l)
+{
l = g_list_append(l, (gpointer)"Enter Remote IP");
l = g_list_append(l, (gpointer)"Use Software Mixer");
return l;
@@ -1472,7 +1480,8 @@ GList *appendESDDevices(GList *l) {
// Gets text string from a gtk entry, interpreting
// MSGTR_PREFERENCES_DriverDefault as null string.
-const char *getGtkEntryText(GtkWidget *from) {
+static const char *getGtkEntryText(GtkWidget *from)
+{
const char *tmp = gtk_entry_get_text(GTK_ENTRY(from));
if (strcmp(tmp, MSGTR_PREFERENCES_DriverDefault) == 0) {
tmp = NULL;
@@ -1482,7 +1491,8 @@ const char *getGtkEntryText(GtkWidget *from) {
// Sets text string of a gtk entry, interpreting
// null string as MSGTR_PREFERENCES_DriverDefault.
-void setGtkEntryText(GtkWidget *dest, char *to) {
+static void setGtkEntryText(GtkWidget *dest, char *to)
+{
if (!to) {
to = MSGTR_PREFERENCES_DriverDefault;
}
diff --git a/gui/mplayer/gtk/sb.c b/gui/mplayer/gtk/sb.c
index 7b793a73b3..8110dadf46 100644
--- a/gui/mplayer/gtk/sb.c
+++ b/gui/mplayer/gtk/sb.c
@@ -51,7 +51,7 @@ void ShowSkinBrowser( void )
else SkinBrowser=create_SkinBrowser();
}
-void HideSkinBrowser( void )
+static void HideSkinBrowser( void )
{
if ( !SkinBrowser ) return;
gtk_widget_hide( SkinBrowser );
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 01:43:33 +0000