March 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r36099 - in trunk: DOCS/man/en/mplayer.1 cfg-mplayer.h mplayer.c mplayer.h
by reimar 30 Mar '13

30 Mar '13

Author: reimar Date: Sat Mar 30 09:42:57 2013 New Revision: 36099 Log: Add -heartbeat-interval option. Patch by Android Jack [jackdroido gmail], with minor modification and man page update by me. Modified: trunk/cfg-mplayer.h trunk/mplayer.c trunk/mplayer.h Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/cfg-mplayer.h ============================================================================== --- trunk/cfg-mplayer.h Sat Mar 30 04:32:16 2013 (r36098) +++ trunk/cfg-mplayer.h Sat Mar 30 09:42:57 2013 (r36099) @@ -189,6 +189,7 @@ const m_option_t mplayer_opts[]={ {"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, #endif {"heartbeat-cmd", &heartbeat_cmd, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"heartbeat-interval", &heartbeat_interval, CONF_TYPE_FLOAT, CONF_MIN, 0.0, 0, NULL}, {"mouseinput", &vo_nomouse_input, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"nomouseinput", &vo_nomouse_input, CONF_TYPE_FLAG,0, 0, 1, NULL}, Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Mar 30 04:32:16 2013 (r36098) +++ trunk/mplayer.c Sat Mar 30 09:42:57 2013 (r36099) @@ -146,6 +146,7 @@ int enable_mouse_movements; float start_volume = -1; double start_pts = MP_NOPTS_VALUE; char *heartbeat_cmd; +float heartbeat_interval = 30.0; static int max_framesize; int noconsolecontrols; @@ -3818,7 +3819,9 @@ goto_enable_cache: if (heartbeat_cmd) { static unsigned last_heartbeat; unsigned now = GetTimerMS(); - if (now - last_heartbeat > 30000) { + // compare as unsigned so that any mistakes (overflow etc) + // trigger a heartbeat, thus resetting the logic. + if (now - last_heartbeat > (unsigned)(heartbeat_interval * 1000)) { last_heartbeat = now; system(heartbeat_cmd); } Modified: trunk/mplayer.h ============================================================================== --- trunk/mplayer.h Sat Mar 30 04:32:16 2013 (r36098) +++ trunk/mplayer.h Sat Mar 30 09:42:57 2013 (r36099) @@ -33,6 +33,7 @@ extern int frame_dropping; extern int slave_mode; extern int player_idle_mode; extern int use_menu; +extern float heartbeat_interval; extern float audio_delay; extern double start_pts;

1 0

r36098 - trunk/configure
by upsuper 30 Mar '13

30 Mar '13

Author: upsuper Date: Sat Mar 30 04:32:16 2013 New Revision: 36098 Log: Move PIC detection to the front of PIE added. It seems that clang turns off PIC when -fpie is set, which causes part of ffmpeg failed to be compiled on OS X. In fact, in the configure of ffmpeg, PIC is unconditionally enabled, which could be introduced as ffmpeg seems to be an essential part of mplayer. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Mar 29 18:28:44 2013 (r36097) +++ trunk/configure Sat Mar 30 04:32:16 2013 (r36098) @@ -2761,6 +2761,14 @@ if test -n "$CPPFLAGS" ; then fi +echocheck "PIC" +def_pic='#define CONFIG_PIC 0' +pic=no +cpp_condition_check '' 'defined(__PIC__) || defined(__pic__) || defined(PIC)' && + pic=yes && extra_cflags="$extra_cflags -DPIC" && def_pic='#define CONFIG_PIC 1' +echores $pic + + # try to create a relocatable binary by default echocheck "relocatable binary" if test $relocatable = "auto" ; then @@ -2844,14 +2852,6 @@ if x86_32 ; then fi #if x86_32 -echocheck "PIC" -def_pic='#define CONFIG_PIC 0' -pic=no -cpp_condition_check '' 'defined(__PIC__) || defined(__pic__) || defined(PIC)' && - pic=yes && extra_cflags="$extra_cflags -DPIC" && def_pic='#define CONFIG_PIC 1' -echores $pic - - def_bswap='#define HAVE_BSWAP 0' def_ebx_available='#define HAVE_EBX_AVAILABLE 0' def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'

1 0

r36096 - trunk/gui/dialog/equalizer.c
by ib 29 Mar '13

29 Mar '13

Author: ib Date: Fri Mar 29 18:23:47 2013 New Revision: 36096 Log: Remove HideEqualizer() and HideEquConfig(). Simply destroy the windows. (It's pointless to check whether the window is existing, because it cannot be called without an existing window.) Modified: trunk/gui/dialog/equalizer.c Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Fri Mar 29 18:21:31 2013 (r36095) +++ trunk/gui/dialog/equalizer.c Fri Mar 29 18:23:47 2013 (r36096) @@ -125,23 +125,6 @@ static void eqSetChannelNames( void ) gtk_clist_select_row( GTK_CLIST( ChannelsList ),0,0 ); } -static void HideEquConfig( void ) -{ - if ( !EquConfig ) return; - gtk_widget_hide( EquConfig ); - gtk_widget_destroy( EquConfig ); - EquConfig=NULL; -} - -static void HideEqualizer( void ) -{ - if ( !Equalizer ) return; - gtk_widget_hide( Equalizer ); - gtk_widget_destroy( Equalizer ); - Equalizer=NULL; - if ( EquConfig ) HideEquConfig(); -} - static gboolean eqHScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data ) { equalizer_t eq; @@ -189,7 +172,15 @@ static void eqButtonReleased( GtkButton { switch( (int)user_data ) { - case 0: HideEqualizer(); break; + case 0: + gtk_widget_destroy( Equalizer ); + Equalizer=NULL; + if ( EquConfig ) + { + gtk_widget_destroy( EquConfig ); + EquConfig=NULL; + } + break; case 1: if ( gtk_notebook_get_current_page( GTK_NOTEBOOK( Notebook ) ) == 0 ) { @@ -572,7 +563,8 @@ static void ecButtonReleased( GtkButton nfree( gtkEquChannel6 ); gtkEquChannel6=gstrdup( gtk_entry_get_text( GTK_ENTRY( CEChannel6 ) ) ); eqSetChannelNames(); } - HideEquConfig(); + gtk_widget_destroy( EquConfig ); + EquConfig=NULL; } GtkWidget * CreateEquConfig( void )

1 0

r36095 - trunk/gui/dialog/fileselect.c
by ib 29 Mar '13

29 Mar '13

Author: ib Date: Fri Mar 29 18:21:31 2013 New Revision: 36095 Log: Remove HideFileSelect(). Simply destroy the window. (It's pointless to check whether the window is existing, because it cannot be called without an existing window.) Additionally, relocate and call fs_Cancel_released() which holds the destruction code now. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Fri Mar 29 18:17:02 2013 (r36094) +++ trunk/gui/dialog/fileselect.c Fri Mar 29 18:21:31 2013 (r36095) @@ -274,15 +274,6 @@ static void fs_AddPathUtf8 (const char * g_hash_table_insert(fsPathTable, strdup(utf8name), strdup(name)); } -static void HideFileSelect( void ) -{ - if ( !FileSelector ) return; - gtk_widget_hide( FileSelector ); - gtk_widget_destroy( FileSelector ); - FileSelector=NULL; - fsLastFNameListSelected = fsCurrFNameListSelected; -} - static void fs_PersistantHistory( char * subject ) { unsigned int i; @@ -388,6 +379,13 @@ static void fs_Up_released( GtkButton * return; } +static void fs_Cancel_released( GtkButton * button,gpointer user_data ) +{ + gtk_widget_destroy( FileSelector ); + FileSelector=NULL; + fsLastFNameListSelected = fsCurrFNameListSelected; +} + static void fs_Ok_released( GtkButton * button, gpointer user_data ) { char * fsSelectedDirectory; @@ -444,17 +442,12 @@ static void fs_Ok_released( GtkButton * free(fsSelectedDirectory); - HideFileSelect(); + fs_Cancel_released(NULL, NULL); if ( uiLoadPlay ) { uiLoadPlay=False; uiEvent( evPlay,0 ); } else gui( GUI_SET_STATE,(void *) GUI_STOP ); } -static void fs_Cancel_released( GtkButton * button,gpointer user_data ) -{ - HideFileSelect(); -} - static void fs_fsFNameList_select_row( GtkCList * clist, gint row, gint column, GdkEvent * event, gpointer user_data) {

1 0

r36094 - trunk/gui/dialog/playlist.c
by ib 29 Mar '13

29 Mar '13

Author: ib Date: Fri Mar 29 18:17:02 2013 New Revision: 36094 Log: Remove HidePlaylist(). Simply destroy the window. (It's pointless to check whether the window is existing, because it cannot be called without an existing window.) Modified: trunk/gui/dialog/playlist.c Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Fri Mar 29 18:15:19 2013 (r36093) +++ trunk/gui/dialog/playlist.c Fri Mar 29 18:17:02 2013 (r36094) @@ -90,18 +90,6 @@ static int compare_func(const void *a, c return i; } -static void HidePlaylist( void ) -{ - if ( !Playlist ) return; - NrOfSelected=NrOfEntrys=0; - nfree( CLListSelected ); nfree( CLFileSelected ); - free( old_path ); - old_path=strdup( current_path ); - gtk_widget_hide( Playlist ); - gtk_widget_destroy( Playlist ); - Playlist=NULL; -} - static void plRowSelect( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data ) { switch ( (int) user_data ) @@ -177,7 +165,13 @@ static void plButtonReleased( GtkButton free(curr.name); } case 0: // cancel - HidePlaylist(); + NrOfSelected=NrOfEntrys=0; + nfree( CLListSelected ); + nfree( CLFileSelected ); + free( old_path ); + old_path=strdup( current_path ); + gtk_widget_destroy( Playlist ); + Playlist=NULL; break; case 2: // remove {

1 0

r36093 - trunk/gui/dialog/skinbrowser.c
by ib 29 Mar '13

29 Mar '13

Author: ib Date: Fri Mar 29 18:15:19 2013 New Revision: 36093 Log: Remove HideSkinBrowser(). Simply destroy the window. (It's pointless to check whether the window is existing, because it cannot be called without an existing window.) Modified: trunk/gui/dialog/skinbrowser.c Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Fri Mar 29 15:09:40 2013 (r36092) +++ trunk/gui/dialog/skinbrowser.c Fri Mar 29 18:15:19 2013 (r36093) @@ -44,14 +44,6 @@ static char * prev=NULL; GtkWidget * SkinBrowser = NULL; -static void HideSkinBrowser( void ) -{ - if ( !SkinBrowser ) return; - gtk_widget_hide( SkinBrowser ); - gtk_widget_destroy( SkinBrowser ); - SkinBrowser=NULL; -} - static void prButton( GtkButton * button,gpointer user_data ) { if ( sbSelectedSkin ) @@ -68,7 +60,8 @@ static void prButton( GtkButton * button break; } } - HideSkinBrowser(); + gtk_widget_destroy( SkinBrowser ); + SkinBrowser=NULL; } static void on_SkinList_select_row( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data ) @@ -85,7 +78,8 @@ static void on_SkinList_select_row( GtkC { free( skinName ); skinName=strdup( sbSelectedSkin ); - HideSkinBrowser(); + gtk_widget_destroy( SkinBrowser ); + SkinBrowser=NULL; } }

1 0

r36092 - trunk/gui/dialog/equalizer.c
by ib 29 Mar '13

29 Mar '13

Author: ib Date: Fri Mar 29 15:09:40 2013 New Revision: 36092 Log: Make HideEquConfig() static. It only has file scope. In order to do so, relocate the functions. Additionally, remove unnecessary declaration. Modified: trunk/gui/dialog/equalizer.c Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Fri Mar 29 14:54:58 2013 (r36091) +++ trunk/gui/dialog/equalizer.c Fri Mar 29 15:09:40 2013 (r36092) @@ -71,7 +71,6 @@ char * gtkEquChannel6 = NULL; // --- void ShowEquConfig( void ); -void HideEquConfig( void ); static void eqSetBands( int channel ) { @@ -126,6 +125,14 @@ static void eqSetChannelNames( void ) gtk_clist_select_row( GTK_CLIST( ChannelsList ),0,0 ); } +static void HideEquConfig( void ) +{ + if ( !EquConfig ) return; + gtk_widget_hide( EquConfig ); + gtk_widget_destroy( EquConfig ); + EquConfig=NULL; +} + static void HideEqualizer( void ) { if ( !Equalizer ) return; @@ -553,14 +560,6 @@ void ShowEquConfig( void ) gtkSetLayer( EquConfig ); } -void HideEquConfig( void ) -{ - if ( !EquConfig ) return; - gtk_widget_hide( EquConfig ); - gtk_widget_destroy( EquConfig ); - EquConfig=NULL; -} - static void ecButtonReleased( GtkButton * button,gpointer user_data ) { if ( (int)user_data )

1 0

r36091 - trunk/gui/dialog/url.c
by ib 29 Mar '13

29 Mar '13

Author: ib Date: Fri Mar 29 14:54:58 2013 New Revision: 36091 Log: Remove HideURLDialog(). Simply destroy the window. (It's pointless to check whether the window is existing, because it cannot be called without an existing window.) Modified: trunk/gui/dialog/url.c Modified: trunk/gui/dialog/url.c ============================================================================== --- trunk/gui/dialog/url.c Fri Mar 29 14:43:21 2013 (r36090) +++ trunk/gui/dialog/url.c Fri Mar 29 14:54:58 2013 (r36091) @@ -42,14 +42,6 @@ static GtkWidget * URLCombo; static GtkWidget * URLEntry; static GList * URLComboEntrys = NULL; -static void HideURLDialog( void ) -{ - if ( !URLDialog ) return; - gtk_widget_hide( URLDialog ); - gtk_widget_destroy( URLDialog ); - URLDialog=0; -} - static void on_Button_pressed( GtkButton * button,gpointer user_data ) { urlItem * item; @@ -79,7 +71,8 @@ static void on_Button_pressed( GtkButton uiEvent( evPlay,0 ); } } - HideURLDialog(); + gtk_widget_destroy( URLDialog ); + URLDialog = NULL; } static GtkWidget * CreateURLDialog( void )

1 0

r36090 - in trunk/gui/dialog: about.c dialog.c equalizer.c fileselect.c menu.c menu.h msgbox.c playlist.c preferences.c skinbrowser.c url.c
by ib 29 Mar '13

29 Mar '13

Author: ib Date: Fri Mar 29 14:43:21 2013 New Revision: 36090 Log: Cosmetic: Rename the functions creating the dialogs. Modified: trunk/gui/dialog/about.c trunk/gui/dialog/dialog.c trunk/gui/dialog/equalizer.c trunk/gui/dialog/fileselect.c trunk/gui/dialog/menu.c trunk/gui/dialog/menu.h trunk/gui/dialog/msgbox.c trunk/gui/dialog/playlist.c trunk/gui/dialog/preferences.c trunk/gui/dialog/skinbrowser.c trunk/gui/dialog/url.c Modified: trunk/gui/dialog/about.c ============================================================================== --- trunk/gui/dialog/about.c Fri Mar 29 02:41:06 2013 (r36089) +++ trunk/gui/dialog/about.c Fri Mar 29 14:43:21 2013 (r36090) @@ -31,7 +31,7 @@ GtkWidget * About = NULL; static void abWidgetDestroy( GtkButton * button, gpointer user_data ) { WidgetDestroy( NULL,&About ); } -static GtkWidget * create_About( void ) +static GtkWidget * CreateAbout( void ) { GtkWidget * vbox; GtkWidget * pixmap1; @@ -348,6 +348,6 @@ static GtkWidget * create_About( void ) void ShowAbout( void ) { if ( About ) gtkActive( About ); - else About=create_About(); + else About=CreateAbout(); gtk_widget_show( About ); } Modified: trunk/gui/dialog/dialog.c ============================================================================== --- trunk/gui/dialog/dialog.c Fri Mar 29 02:41:06 2013 (r36089) +++ trunk/gui/dialog/dialog.c Fri Mar 29 14:43:21 2013 (r36090) @@ -353,7 +353,7 @@ void gtkShow(int type, char *param) gtk_widget_destroy(PopUpMenu); } - PopUpMenu = create_PopUpMenu(); + PopUpMenu = CreatePopUpMenu(); gtk_menu_popup(GTK_MENU(PopUpMenu), NULL, NULL, NULL, NULL, 0, 0); break; Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Fri Mar 29 02:41:06 2013 (r36089) +++ trunk/gui/dialog/equalizer.c Fri Mar 29 14:43:21 2013 (r36090) @@ -232,7 +232,7 @@ static void eqNotebook( GtkNotebook * no else gtk_widget_show( Config ); } -static GtkWidget * create_Equalizer( void ) +static GtkWidget * CreateEqualizer( void ) { GtkWidget * vbox1; GtkWidget * hbox1; @@ -461,7 +461,7 @@ static GtkWidget * create_Equalizer( voi void ShowEqualizer( void ) { if ( Equalizer ) gtkActive( Equalizer ); - else Equalizer=create_Equalizer(); + else Equalizer=CreateEqualizer(); if ( !gtkEquChannel1 ) gtkEquChannel1=strdup( MSGTR_EQU_Front_Right ); if ( !gtkEquChannel2 ) gtkEquChannel2=strdup( MSGTR_EQU_Front_Left ); @@ -517,14 +517,14 @@ static GtkWidget * CEChannel6; static GtkWidget * ecOk; static GtkWidget * ecCancel; -GtkWidget * create_EquConfig( void ); +GtkWidget * CreateEquConfig( void ); void ShowEquConfig( void ) { GList * Items = NULL; if ( EquConfig ) gtkActive( EquConfig ); - else EquConfig=create_EquConfig(); + else EquConfig=CreateEquConfig(); Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Right ); Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Left ); @@ -576,7 +576,7 @@ static void ecButtonReleased( GtkButton HideEquConfig(); } -GtkWidget * create_EquConfig( void ) +GtkWidget * CreateEquConfig( void ) { GtkWidget * vbox1; GtkWidget * table1; Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Fri Mar 29 02:41:06 2013 (r36089) +++ trunk/gui/dialog/fileselect.c Fri Mar 29 14:43:21 2013 (r36090) @@ -523,7 +523,7 @@ static void fs_Destroy( void ) fsTopList_items = NULL; } -static GtkWidget * create_FileSelect( void ) +static GtkWidget * CreateFileSelect( void ) { GtkWidget * vbox4; GtkWidget * hbox4; @@ -660,7 +660,7 @@ void ShowFileSelector( int type ) struct stat f; if ( FileSelector ) gtkActive( FileSelector ); - else FileSelector=create_FileSelect(); + else FileSelector=CreateFileSelect(); fsType=type; switch ( type ) Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Fri Mar 29 02:41:06 2013 (r36089) +++ trunk/gui/dialog/menu.c Fri Mar 29 14:43:21 2013 (r36090) @@ -413,7 +413,7 @@ GtkWidget * VCDTitleMenu; GtkWidget * CDSubMenu; GtkWidget * CDTitleMenu; -GtkWidget * create_PopUpMenu( void ) +GtkWidget * CreatePopUpMenu( void ) { GtkWidget * window1; GtkWidget * Menu = NULL; Modified: trunk/gui/dialog/menu.h ============================================================================== --- trunk/gui/dialog/menu.h Fri Mar 29 02:41:06 2013 (r36089) +++ trunk/gui/dialog/menu.h Fri Mar 29 14:43:21 2013 (r36090) @@ -26,6 +26,6 @@ extern GtkWidget * DVDSubMenu; 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 ); +GtkWidget * CreatePopUpMenu( void ); #endif /* MPLAYER_GUI_MENU_H */ Modified: trunk/gui/dialog/msgbox.c ============================================================================== --- trunk/gui/dialog/msgbox.c Fri Mar 29 02:41:06 2013 (r36089) +++ trunk/gui/dialog/msgbox.c Fri Mar 29 14:43:21 2013 (r36090) @@ -38,7 +38,7 @@ static void on_Ok_released( GtkButton * MessageBox=NULL; } -static GtkWidget * create_MessageBox( void ) +static GtkWidget * CreateMessageBox( void ) { GtkWidget * vbox1; GtkWidget * hbox1; @@ -110,6 +110,6 @@ static GtkWidget * create_MessageBox( vo void ShowMessageBox( const char * msg ) { if ( MessageBox ) { gtk_widget_hide( MessageBox ); gtk_widget_destroy( MessageBox ); } - MessageBox=create_MessageBox(); + MessageBox=CreateMessageBox(); if ( strlen( msg ) < 20 ) gtk_widget_set_usize( MessageBox,196,-1 ); } Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Fri Mar 29 02:41:06 2013 (r36089) +++ trunk/gui/dialog/playlist.c Fri Mar 29 14:43:21 2013 (r36090) @@ -415,7 +415,7 @@ static void plCTRow(GtkCList * clist, gi CLFileSelected=calloc( 1,NrOfEntrys * sizeof( int ) ); } -static GtkWidget * create_Playlist( void ) +static GtkWidget * CreatePlaylist( void ) { GtkWidget * vbox1; GtkWidget * hbox1; @@ -577,7 +577,7 @@ void ShowPlaylist( void ) plItem * next; if ( Playlist ) gtkActive( Playlist ); - else Playlist=create_Playlist(); + else Playlist=CreatePlaylist(); if ( old_path && *old_path ) { Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Fri Mar 29 02:41:06 2013 (r36089) +++ trunk/gui/dialog/preferences.c Fri Mar 29 14:43:21 2013 (r36090) @@ -510,7 +510,7 @@ static void prCListRow( GtkCList * clist } } -static GtkWidget * create_Preferences( void ) +static GtkWidget * CreatePreferences( void ) { GtkWidget * label; GtkWidget * frame; @@ -1092,7 +1092,7 @@ static GtkWidget * create_Preferences( v void ShowPreferences( void ) { if ( Preferences ) gtkActive( Preferences ); - else Preferences=create_Preferences(); + else Preferences=CreatePreferences(); /* 1st page */ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ),gtkEnableAudioEqualizer ); @@ -1555,7 +1555,7 @@ static void audioButton(GtkButton *butto } } -static GtkWidget *create_AudioConfig( void ) { +static GtkWidget *CreateAudioConfig( void ) { GList *items = NULL; GtkWidget *vbox; GtkWidget *table; @@ -1677,7 +1677,7 @@ static GtkWidget *create_AudioConfig( vo void ShowAudioConfig( void ) { if (AudioConfig) gtkActive(AudioConfig); - else AudioConfig = create_AudioConfig(); + else AudioConfig = CreateAudioConfig(); #ifdef CONFIG_OSS_AUDIO if (strncmp(ao_driver[0], "oss", 3) == 0) { @@ -1718,12 +1718,12 @@ static GtkWidget * RBVLavc; static GtkWidget * dxr3BOk; static GtkWidget * dxr3BCancel; -GtkWidget * create_DXR3Config( void ); +GtkWidget * CreateDXR3Config( void ); void ShowDXR3Config( void ) { if ( DXR3Config ) gtkActive( DXR3Config ); - else DXR3Config=create_DXR3Config(); + else DXR3Config=CreateDXR3Config(); gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),gtkDXR3Device ); @@ -1755,7 +1755,7 @@ static void dxr3Button( GtkButton * butt } } -GtkWidget * create_DXR3Config( void ) +GtkWidget * CreateDXR3Config( void ) { GtkWidget * vbox1; GtkWidget * vbox2; Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Fri Mar 29 02:41:06 2013 (r36089) +++ trunk/gui/dialog/skinbrowser.c Fri Mar 29 14:43:21 2013 (r36090) @@ -89,7 +89,7 @@ static void on_SkinList_select_row( GtkC } } -static GtkWidget * create_SkinBrowser( void ) +static GtkWidget * CreateSkinBrowser( void ) { GtkWidget * vbox5; GtkWidget * scrolledwindow1; @@ -170,7 +170,7 @@ static GtkWidget * create_SkinBrowser( v void ShowSkinBrowser( void ) { if ( SkinBrowser ) gtkActive( SkinBrowser ); - else SkinBrowser=create_SkinBrowser(); + else SkinBrowser=CreateSkinBrowser(); } int gtkFillSkinList( gchar * mdir ) Modified: trunk/gui/dialog/url.c ============================================================================== --- trunk/gui/dialog/url.c Fri Mar 29 02:41:06 2013 (r36089) +++ trunk/gui/dialog/url.c Fri Mar 29 14:43:21 2013 (r36090) @@ -82,7 +82,7 @@ static void on_Button_pressed( GtkButton HideURLDialog(); } -static GtkWidget * create_URLDialog( void ) +static GtkWidget * CreateURLDialog( void ) { GtkWidget * vbox1; GtkWidget * hbox1; @@ -148,7 +148,7 @@ void ShowURLDialog( void ) urlItem * item; if ( URLDialog ) gtkActive( URLDialog ); - else URLDialog=create_URLDialog(); + else URLDialog=CreateURLDialog(); item = listMgr( URLLIST_GET,0 );

1 0

r36089 - in trunk/gui/dialog: skinbrowser.c skinbrowser.h
by ib 29 Mar '13

29 Mar '13

Author: ib Date: Fri Mar 29 02:41:06 2013 New Revision: 36089 Log: Make create_SkinBrowser() static. It only has file scope. In order to do so, relocate some other static functions. Modified: trunk/gui/dialog/skinbrowser.c trunk/gui/dialog/skinbrowser.h Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Fri Mar 29 02:36:39 2013 (r36088) +++ trunk/gui/dialog/skinbrowser.c Fri Mar 29 02:41:06 2013 (r36089) @@ -44,12 +44,6 @@ static char * prev=NULL; GtkWidget * SkinBrowser = NULL; -void ShowSkinBrowser( void ) -{ - if ( SkinBrowser ) gtkActive( SkinBrowser ); - else SkinBrowser=create_SkinBrowser(); -} - static void HideSkinBrowser( void ) { if ( !SkinBrowser ) return; @@ -58,39 +52,6 @@ static void HideSkinBrowser( void ) SkinBrowser=NULL; } -int gtkFillSkinList( gchar * mdir ) -{ - gchar * str[2]; - gchar * tmp; - int i; - glob_t gg; - struct stat fs; - - gtkOldSkin=strdup( skinName ); - prev=gtkOldSkin; - - str[0]="default"; - str[1]=""; - if ( gtkFindCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str ); - - glob( mdir,GLOB_NOSORT,NULL,&gg ); - for( i=0;i<(int)gg.gl_pathc;i++ ) - { - if ( !strcmp( gg.gl_pathv[i],"." ) || !strcmp( gg.gl_pathv[i],".." ) ) continue; - if ( ( stat( gg.gl_pathv[i],&fs ) == 0 ) && S_ISDIR( fs.st_mode ) ) - { - tmp=strrchr( gg.gl_pathv[i],'/' ); - if (tmp) tmp++; - else tmp = gg.gl_pathv[i]; - if ( !strcmp( tmp,"default" ) ) continue; - str[0]=tmp; - if ( gtkFindCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str ); - } - } - globfree( &gg ); - return True; -} - static void prButton( GtkButton * button,gpointer user_data ) { if ( sbSelectedSkin ) @@ -128,7 +89,7 @@ static void on_SkinList_select_row( GtkC } } -GtkWidget * create_SkinBrowser( void ) +static GtkWidget * create_SkinBrowser( void ) { GtkWidget * vbox5; GtkWidget * scrolledwindow1; @@ -205,3 +166,42 @@ GtkWidget * create_SkinBrowser( void ) return SkinBrowser; } + +void ShowSkinBrowser( void ) +{ + if ( SkinBrowser ) gtkActive( SkinBrowser ); + else SkinBrowser=create_SkinBrowser(); +} + +int gtkFillSkinList( gchar * mdir ) +{ + gchar * str[2]; + gchar * tmp; + int i; + glob_t gg; + struct stat fs; + + gtkOldSkin=strdup( skinName ); + prev=gtkOldSkin; + + str[0]="default"; + str[1]=""; + if ( gtkFindCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str ); + + glob( mdir,GLOB_NOSORT,NULL,&gg ); + for( i=0;i<(int)gg.gl_pathc;i++ ) + { + if ( !strcmp( gg.gl_pathv[i],"." ) || !strcmp( gg.gl_pathv[i],".." ) ) continue; + if ( ( stat( gg.gl_pathv[i],&fs ) == 0 ) && S_ISDIR( fs.st_mode ) ) + { + tmp=strrchr( gg.gl_pathv[i],'/' ); + if (tmp) tmp++; + else tmp = gg.gl_pathv[i]; + if ( !strcmp( tmp,"default" ) ) continue; + str[0]=tmp; + if ( gtkFindCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str ); + } + } + globfree( &gg ); + return True; +} Modified: trunk/gui/dialog/skinbrowser.h ============================================================================== --- trunk/gui/dialog/skinbrowser.h Fri Mar 29 02:36:39 2013 (r36088) +++ trunk/gui/dialog/skinbrowser.h Fri Mar 29 02:41:06 2013 (r36089) @@ -25,6 +25,5 @@ extern char * sbSelectedSkin; extern GtkWidget * SkinBrowser; void ShowSkinBrowser( void ); -GtkWidget * create_SkinBrowser( void ); #endif /* MPLAYER_GUI_SKINBROWSER_H */

1 0