summaryrefslogtreecommitdiffstats
path: root/gui/mplayer
diff options
context:
space:
mode:
Diffstat (limited to 'gui/mplayer')
-rw-r--r--gui/mplayer/gmplayer.h28
-rw-r--r--gui/mplayer/gtk/about.h4
-rw-r--r--gui/mplayer/gtk/eq.h4
-rw-r--r--gui/mplayer/gtk/fs.c2
-rw-r--r--gui/mplayer/gtk/fs.h6
-rw-r--r--gui/mplayer/gtk/gtk_common.h30
-rw-r--r--gui/mplayer/gtk/gtk_url.h4
-rw-r--r--gui/mplayer/gtk/mb.h4
-rw-r--r--gui/mplayer/gtk/menu.h8
-rw-r--r--gui/mplayer/gtk/opts.h6
-rw-r--r--gui/mplayer/gtk/pl.h6
-rw-r--r--gui/mplayer/gtk/sb.h4
-rw-r--r--gui/mplayer/gui_common.c2
-rw-r--r--gui/mplayer/gui_common.h8
-rw-r--r--gui/mplayer/mw.c2
-rw-r--r--gui/mplayer/pb.c4
-rw-r--r--gui/mplayer/play.h48
-rw-r--r--gui/mplayer/widgets.h24
18 files changed, 97 insertions, 97 deletions
diff --git a/gui/mplayer/gmplayer.h b/gui/mplayer/gmplayer.h
index 213f14e70b..636e6ab570 100644
--- a/gui/mplayer/gmplayer.h
+++ b/gui/mplayer/gmplayer.h
@@ -29,23 +29,23 @@ extern int mainVisible;
extern int mplMainAutoPlay;
extern int mplMiddleMenu;
-extern void mplInit( void * disp );
+void mplInit( void * disp );
-extern void mplMainDraw( void );
-extern void mplEventHandling( int msg,float param );
-extern void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY );
-extern void mplMainKeyHandle( int KeyCode,int Type,int Key );
-extern void mplDandDHandler(int num,char** files);
+void mplMainDraw( void );
+void mplEventHandling( int msg, float param );
+void mplMainMouseHandle( int Button, int X, int Y, int RX, int RY );
+void mplMainKeyHandle( int KeyCode, int Type, int Key );
+void mplDandDHandler(int num, char** files);
-extern void mplSubDraw( void );
-extern void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY );
+void mplSubDraw( void );
+void mplSubMouseHandle( int Button, int X, int Y, int RX, int RY );
-extern void mplMenuInit( void );
-extern void mplHideMenu( int mx,int my,int w );
-extern void mplShowMenu( int mx,int my );
-extern void mplMenuMouseHandle( int X,int Y,int RX,int RY );
+void mplMenuInit( void );
+void mplHideMenu( int mx, int my, int w );
+void mplShowMenu( int mx, int my );
+void mplMenuMouseHandle( int X, int Y, int RX, int RY );
-extern void mplPBInit( void );
-extern void mplPBShow( int x, int y );
+void mplPBInit( void );
+void mplPBShow( int x, int y );
#endif /* MPLAYER_GUI_GMPLAYER_H */
diff --git a/gui/mplayer/gtk/about.h b/gui/mplayer/gtk/about.h
index 7487259147..68997ac51b 100644
--- a/gui/mplayer/gtk/about.h
+++ b/gui/mplayer/gtk/about.h
@@ -23,7 +23,7 @@
extern GtkWidget * About;
-extern GtkWidget * create_About( void );
-extern void ShowAboutBox( void );
+GtkWidget * create_About( void );
+void ShowAboutBox( void );
#endif /* MPLAYER_GUI_ABOUT_H */
diff --git a/gui/mplayer/gtk/eq.h b/gui/mplayer/gtk/eq.h
index 01750b8a51..8d4d5f117f 100644
--- a/gui/mplayer/gtk/eq.h
+++ b/gui/mplayer/gtk/eq.h
@@ -23,7 +23,7 @@
extern GtkWidget * Equalizer;
-extern GtkWidget * create_Equalizer( void );
-extern void ShowEqualizer( void );
+GtkWidget * create_Equalizer( void );
+void ShowEqualizer( void );
#endif /* MPLAYER_GUI_EQ_H */
diff --git a/gui/mplayer/gtk/fs.c b/gui/mplayer/gtk/fs.c
index fb774dead8..b182594df7 100644
--- a/gui/mplayer/gtk/fs.c
+++ b/gui/mplayer/gtk/fs.c
@@ -43,7 +43,7 @@
#ifndef __linux__
#define get_current_dir_name() getcwd(NULL, PATH_MAX)
#else
-extern char * get_current_dir_name( void );
+char * get_current_dir_name( void );
#endif
gchar * fsSelectedFile = NULL;
diff --git a/gui/mplayer/gtk/fs.h b/gui/mplayer/gtk/fs.h
index 5e00eb7b07..bb0dfe2afd 100644
--- a/gui/mplayer/gtk/fs.h
+++ b/gui/mplayer/gtk/fs.h
@@ -31,9 +31,9 @@
extern GtkWidget * fsFileSelect;
-extern void HideFileSelect( void );
-extern void ShowFileSelect( int type, int modal );
+void HideFileSelect( void );
+void ShowFileSelect( int type, int modal );
-extern GtkWidget * create_FileSelect( void );
+GtkWidget * create_FileSelect( void );
#endif /* MPLAYER_GUI_FS_H */
diff --git a/gui/mplayer/gtk/gtk_common.h b/gui/mplayer/gtk/gtk_common.h
index 34137c9bbb..eff9887e1f 100644
--- a/gui/mplayer/gtk/gtk_common.h
+++ b/gui/mplayer/gtk/gtk_common.h
@@ -22,20 +22,20 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-extern GtkWidget * AddDialogFrame( GtkWidget * parent );
-extern GtkWidget * AddFrame( const char * title,int type,GtkWidget * parent,int add );
-extern GtkWidget * AddLabel( const char * title,GtkWidget * parent );
-extern GtkWidget * AddVBox( GtkWidget * parent,int type );
-extern GtkWidget * AddHBox( GtkWidget * parent,int type );
-extern GtkWidget * AddCheckButton( const char * title, GtkWidget * parent );
-extern GtkWidget * AddRadioButton( const char * title,GSList ** group,GtkWidget * parent );
-extern GtkWidget * AddSpinButton( const char * title,GtkAdjustment * adj,GtkWidget * parent );
-extern GtkWidget * AddButton( const char * title,GtkWidget * parent );
-extern GtkWidget * AddHSeparator( GtkWidget * parent );
-extern GtkWidget * AddHButtonBox( GtkWidget * parent );
-extern GtkWidget * AddHScaler( GtkAdjustment * adj,GtkWidget * parent,int digit );
-extern GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit );
-extern GtkWidget * AddComboBox( GtkWidget * parent );
-extern void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer );
+GtkWidget * AddDialogFrame( GtkWidget * parent );
+GtkWidget * AddFrame( const char * title, int type, GtkWidget * parent, int add );
+GtkWidget * AddLabel( const char * title, GtkWidget * parent );
+GtkWidget * AddVBox( GtkWidget * parent, int type );
+GtkWidget * AddHBox( GtkWidget * parent, int type );
+GtkWidget * AddCheckButton( const char * title, GtkWidget * parent );
+GtkWidget * AddRadioButton( const char * title, GSList ** group, GtkWidget * parent );
+GtkWidget * AddSpinButton( const char * title, GtkAdjustment * adj, GtkWidget * parent );
+GtkWidget * AddButton( const char * title, GtkWidget * parent );
+GtkWidget * AddHSeparator( GtkWidget * parent );
+GtkWidget * AddHButtonBox( GtkWidget * parent );
+GtkWidget * AddHScaler( GtkAdjustment * adj, GtkWidget * parent, int digit );
+GtkWidget * AddVScaler( GtkAdjustment * adj, GtkWidget * parent, int digit );
+GtkWidget * AddComboBox( GtkWidget * parent );
+void WidgetDestroy( GtkWidget * widget, GtkWidget ** widget_pointer );
#endif /* MPLAYER_GUI_GTK_COMMON_H */
diff --git a/gui/mplayer/gtk/gtk_url.h b/gui/mplayer/gtk/gtk_url.h
index 5398692091..814c053bd4 100644
--- a/gui/mplayer/gtk/gtk_url.h
+++ b/gui/mplayer/gtk/gtk_url.h
@@ -24,7 +24,7 @@
extern GtkWidget * URL;
extern int gtkVURLDialogBox;
-extern void ShowURLDialogBox( void );
-extern GtkWidget * create_URL( void );
+void ShowURLDialogBox( void );
+GtkWidget * create_URL( void );
#endif /* MPLAYER_GUI_GTK_URL_H */
diff --git a/gui/mplayer/gtk/mb.h b/gui/mplayer/gtk/mb.h
index 8274d212ce..75b0a2cc62 100644
--- a/gui/mplayer/gtk/mb.h
+++ b/gui/mplayer/gtk/mb.h
@@ -23,7 +23,7 @@
extern GtkWidget * MessageBox;
-extern GtkWidget * create_MessageBox( int type );
-extern void ShowMessageBox( const char * msg );
+GtkWidget * create_MessageBox( int type );
+void ShowMessageBox( const char * msg );
#endif /* MPLAYER_GUI_MB_H */
diff --git a/gui/mplayer/gtk/menu.h b/gui/mplayer/gtk/menu.h
index 1cdeac3a77..a5e86d70ee 100644
--- a/gui/mplayer/gtk/menu.h
+++ b/gui/mplayer/gtk/menu.h
@@ -23,9 +23,9 @@
extern GtkWidget * DVDSubMenu;
-extern GtkWidget * AddMenuItem( GtkWidget *window1, const char * immagine_xpm, GtkWidget * SubMenu,const char * label,int Number );
-extern GtkWidget * AddSubMenu( GtkWidget *window1, const char * immagine_xpm, GtkWidget * Menu,const char * label );
-extern GtkWidget * AddSeparator( GtkWidget * Menu );
-extern GtkWidget * create_PopUpMenu( void );
+GtkWidget * AddMenuItem( GtkWidget *window1, const char * immagine_xpm, GtkWidget * SubMenu, const char * label, int Number );
+GtkWidget * AddSubMenu( GtkWidget *window1, const char * immagine_xpm, GtkWidget * Menu, const char * label );
+GtkWidget * AddSeparator( GtkWidget * Menu );
+GtkWidget * create_PopUpMenu( void );
#endif /* MPLAYER_GUI_MENU_H */
diff --git a/gui/mplayer/gtk/opts.h b/gui/mplayer/gtk/opts.h
index fa9a28abba..b503c4811b 100644
--- a/gui/mplayer/gtk/opts.h
+++ b/gui/mplayer/gtk/opts.h
@@ -25,9 +25,9 @@ extern GtkWidget * AudioConfig;
extern GtkWidget * Preferences;
extern GtkWidget * prEFontName;
-extern GtkWidget * create_Preferences( void );
-extern GtkWidget * create_AudioConfig( void );
+GtkWidget * create_Preferences( void );
+GtkWidget * create_AudioConfig( void );
-extern void ShowPreferences( void );
+void ShowPreferences( void );
#endif /* MPLAYER_GUI_OPTS_H */
diff --git a/gui/mplayer/gtk/pl.h b/gui/mplayer/gtk/pl.h
index 008fcda0ab..003c589847 100644
--- a/gui/mplayer/gtk/pl.h
+++ b/gui/mplayer/gtk/pl.h
@@ -21,9 +21,9 @@
#include <gtk/gtk.h>
-extern void ShowPlayList( void );
-extern void HidePlayList( void );
+void ShowPlayList( void );
+void HidePlayList( void );
-extern GtkWidget * create_PlayList (void);
+GtkWidget * create_PlayList (void);
#endif /* MPLAYER_GUI_PL_H */
diff --git a/gui/mplayer/gtk/sb.h b/gui/mplayer/gtk/sb.h
index 25cea9e597..b9f37a8c48 100644
--- a/gui/mplayer/gtk/sb.h
+++ b/gui/mplayer/gtk/sb.h
@@ -24,7 +24,7 @@
extern char * sbSelectedSkin;
extern GtkWidget * SkinBrowser;
-extern void ShowSkinBrowser( void );
-extern GtkWidget * create_SkinBrowser( void );
+void ShowSkinBrowser( void );
+GtkWidget * create_SkinBrowser( void );
#endif /* MPLAYER_GUI_SB_H */
diff --git a/gui/mplayer/gui_common.c b/gui/mplayer/gui_common.c
index 957e85d3b1..d6df8b0f39 100644
--- a/gui/mplayer/gui_common.c
+++ b/gui/mplayer/gui_common.c
@@ -48,7 +48,7 @@
#include "play.h"
#include "widgets.h"
-extern unsigned int GetTimerMS( void );
+unsigned int GetTimerMS( void );
static inline void TranslateFilename( int c,char * tmp,size_t tmplen )
{
diff --git a/gui/mplayer/gui_common.h b/gui/mplayer/gui_common.h
index f5791b02c5..d067d39618 100644
--- a/gui/mplayer/gui_common.h
+++ b/gui/mplayer/gui_common.h
@@ -29,9 +29,9 @@
#include "gui/bitmap.h"
#include "gui/wm/ws.h"
-extern char * Translate( char * str );
-extern void PutImage( txSample * bf,int x,int y,int max,int ofs );
-extern void SimplePotmeterPutImage( txSample * bf,int x,int y,float frac );
-extern void Render( wsTWindow * window,wItem * Items,int nrItems,char * db,int size );
+char * Translate( char * str );
+void PutImage( txSample * bf,int x, int y, int max, int ofs );
+void SimplePotmeterPutImage( txSample * bf, int x, int y, float frac );
+void Render( wsTWindow * window, wItem * Items, int nrItems, char * db, int size );
#endif /* MPLAYER_GUI_GUI_COMMON_H */
diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c
index 6f8866c640..1d9dfbedc8 100644
--- a/gui/mplayer/mw.c
+++ b/gui/mplayer/mw.c
@@ -53,7 +53,7 @@
#include "play.h"
#include "widgets.h"
-extern unsigned int GetTimerMS( void );
+unsigned int GetTimerMS( void );
unsigned char * mplDrawBuffer = NULL;
int mplMainRender = 1;
diff --git a/gui/mplayer/pb.c b/gui/mplayer/pb.c
index 80532f6db7..65f28289fe 100644
--- a/gui/mplayer/pb.c
+++ b/gui/mplayer/pb.c
@@ -48,8 +48,8 @@
#include "widgets.h"
#include "gui_common.h"
-extern unsigned int GetTimerMS( void );
-extern unsigned int GetTimer( void );
+unsigned int GetTimerMS( void );
+unsigned int GetTimer( void );
unsigned char * mplPBDrawBuffer = NULL;
int mplPBVisible = 0;
diff --git a/gui/mplayer/play.h b/gui/mplayer/play.h
index 9fed1cf1ca..a96476e530 100644
--- a/gui/mplayer/play.h
+++ b/gui/mplayer/play.h
@@ -23,29 +23,29 @@
extern int mplGotoTheNext;
-extern void mplEnd( void );
-extern void mplFullScreen( void );
-extern void mplPlay( void );
-extern void mplPause( void );
-extern void mplState( void );
-extern void mplPrev( void );
-extern void mplNext( void );
-extern void mplCurr( void );
-
-extern void mplIncAudioBufDelay( void );
-extern void mplDecAudioBufDelay( void );
-
-extern void mplRelSeek( float s );
-extern void mplAbsSeek( float s );
-extern float mplGetPosition( void );
-
-extern void mplPlayFork( void );
-extern void mplSigHandler( int s );
-extern void mplPlayerThread( void );
-
-extern void ChangeSkin( char * name );
-extern void EventHandling( void );
-
-extern void mplSetFileName( char * dir,char * name,int type );
+void mplEnd( void );
+void mplFullScreen( void );
+void mplPlay( void );
+void mplPause( void );
+void mplState( void );
+void mplPrev( void );
+void mplNext( void );
+void mplCurr( void );
+
+void mplIncAudioBufDelay( void );
+void mplDecAudioBufDelay( void );
+
+void mplRelSeek( float s );
+void mplAbsSeek( float s );
+float mplGetPosition( void );
+
+void mplPlayFork( void );
+void mplSigHandler( int s );
+void mplPlayerThread( void );
+
+void ChangeSkin( char * name );
+void EventHandling( void );
+
+void mplSetFileName( char * dir, char * name, int type );
#endif /* MPLAYER_GUI_PLAY_H */
diff --git a/gui/mplayer/widgets.h b/gui/mplayer/widgets.h
index 811c599e9b..4a6ee40dfe 100644
--- a/gui/mplayer/widgets.h
+++ b/gui/mplayer/widgets.h
@@ -60,21 +60,21 @@ extern GdkBitmap * gtkIconMask;
extern Pixmap guiIcon;
extern Pixmap guiIconMask;
-extern void widgetsCreate( void );
+void widgetsCreate( void );
-extern void gtkInit( void );
-extern void gtkAddIcon( GtkWidget * window );
+void gtkInit( void );
+void gtkAddIcon( GtkWidget * window );
-extern int gtkFillSkinList( gchar * dir );
-extern void gtkClearList( GtkWidget * list );
-extern void gtkSetDefaultToCList( GtkWidget * list,char * item );
-extern int gtkFindCList( GtkWidget * list,char * item );
+int gtkFillSkinList( gchar * dir );
+void gtkClearList( GtkWidget * list );
+void gtkSetDefaultToCList( GtkWidget * list, char * item );
+int gtkFindCList( GtkWidget * list, char * item );
-extern void gtkEventHandling( void );
+void gtkEventHandling( void );
-extern void gtkShow( int type,char * param );
-extern void gtkMessageBox( int type,const gchar * str );
-extern void gtkSetLayer( GtkWidget * wdg );
-extern void gtkActive( GtkWidget * wdg );
+void gtkShow( int type, char * param );
+void gtkMessageBox( int type, const gchar * str );
+void gtkSetLayer( GtkWidget * wdg );
+void gtkActive( GtkWidget * wdg );
#endif /* MPLAYER_GUI_WIDGETS_H */