From 89d27a656e972f0c199692a2392e571c4ed6a42d Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Tue, 23 Aug 2011 22:09:30 -0500 Subject: [PATCH] uncomment splash code on gtk loadingwindow; still doesn't work --- src/arch/LoadingWindow/LoadingWindow_Gtk.cpp | 6 +++--- src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp | 6 +++--- src/arch/LoadingWindow/LoadingWindow_GtkModule.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp b/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp index bb48994f3d..0fbb07199c 100644 --- a/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp +++ b/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp @@ -12,7 +12,7 @@ static INIT Module_Init; static SHUTDOWN Module_Shutdown; static SETTEXT Module_SetText; //static SETICON Module_SetIcon; -//static SETSPLASH Module_SetSplash; +static SETSPLASH Module_SetSplash; static SETPROGRESS Module_SetProgress; static SETINDETERMINATE Module_SetIndeterminate; @@ -49,11 +49,11 @@ RString LoadingWindow_Gtk::Init() Module_SetIcon = (SETICON) dlsym(Handle, "SetIcon"); if( !Module_SetIcon ) return ModuleError("SetIcon"); + */ Module_SetSplash = (SETSPLASH) dlsym(Handle, "SetSplash"); if( !Module_SetSplash ) return ModuleError("SetSplash"); - */ Module_SetProgress = (SETPROGRESS) dlsym(Handle, "SetProgress"); if( !Module_SetProgress ) @@ -92,7 +92,7 @@ void LoadingWindow_Gtk::SetIcon( const RageSurface *pIcon ) void LoadingWindow_Gtk::SetSplash( const RString str ) { - //Module_SetSplash( str ); + Module_SetSplash( str ); } void LoadingWindow_Gtk::SetProgress( const int progress ) diff --git a/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp b/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp index 0feaacb971..21e5e70637 100644 --- a/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp +++ b/src/arch/LoadingWindow/LoadingWindow_GtkModule.cpp @@ -60,7 +60,7 @@ extern "C" void SetText( const char *s ) gtk_widget_show(label); gtk_main_iteration_do(FALSE); } - +/* extern "C" void SetIcon( const RageSurface *pSrcImg ) { RageSurface *pImg; @@ -87,14 +87,14 @@ extern "C" void SetIcon( const RageSurface *pSrcImg ) gtk_window_set_icon( GTK_WINDOW(window), pIcon ); gtk_main_iteration_do(FALSE); } -/* +*/ extern "C" void SetSplash( const char *s ) { splash = gtk_image_new_from_file(s); gtk_widget_show(splash); gtk_main_iteration_do(FALSE); } -*/ + extern "C" void SetProgress( int progress, int totalWork ) { gdouble fraction = ( totalWork > 0 ? progress / (gdouble)totalWork : 0 ); diff --git a/src/arch/LoadingWindow/LoadingWindow_GtkModule.h b/src/arch/LoadingWindow/LoadingWindow_GtkModule.h index f803cc2e07..410461ebef 100644 --- a/src/arch/LoadingWindow/LoadingWindow_GtkModule.h +++ b/src/arch/LoadingWindow/LoadingWindow_GtkModule.h @@ -6,8 +6,8 @@ struct RageSurface; typedef const char *(*INIT)(int *argc, char ***argv); typedef void (*SHUTDOWN)(); typedef void (*SETTEXT)( const char *s ); -typedef void (*SETICON)( const RageSurface *pSrcImg ); -//typedef void (*SETSPLASH)( const char *s ); +//typedef void (*SETICON)( const RageSurface *pSrcImg ); +typedef void (*SETSPLASH)( const char *s ); typedef void (*SETPROGRESS)( int progress, int totalWork ); typedef void (*SETINDETERMINATE)( bool indeterminate );