X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FSaverRunner.h;h=c58e2b331a4437e2908008c9ce3f515f6cc17298;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=541bb2cf9261f1c448a876d3d115a55b58c5f1c9;hpb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;p=xscreensaver

diff --git a/OSX/SaverRunner.h b/OSX/SaverRunner.h
index 541bb2cf..c58e2b33 100644
--- a/OSX/SaverRunner.h
+++ b/OSX/SaverRunner.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2006-2012 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2006-2013 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -33,10 +33,6 @@
 
 @class ScreenSaverView;
 
-#ifdef USE_IPHONE
-# import "SaverListController.h"
-#endif
-
 @interface SaverRunner : NSObject
 {
   NSString *saverName;		// the one currently loaded
@@ -48,30 +44,34 @@
   NSBundle *saverBundle;
   NSArray  *windows;
   IBOutlet NSMenu *menubar;
+  NSTimer *anim_timer;
 
 # else  // USE_IPHONE
 
   ScreenSaverView *saverView;
+  UIView *backgroundView;
   UINavigationController *rootViewController;
   IBOutlet UIWindow *window;
   EAGLContext *eagl_ctx;
   GLuint gl_framebuffer, gl_renderbuffer;
   IBOutlet UIView *view;
-  SaverListController *listController;
   UIImage *saved_screenshot;
+  UIView *aboutBox;
+  NSTimer *splashTimer;
 
 # endif // USE_IPHONE
 }
 
-- (void) aboutPanel: (id)sender;
-- (void) openPreferences: (id)sender;
-- (void)loadSaver:(NSString *)name launch:(BOOL)launch;
+- (void) loadSaver: (NSString *)name launch:(BOOL)launch;
 - (void) loadSaver: (NSString *)name;
-- (void)selectedSaverDidChange:(NSDictionary *)change;
+- (void) selectedSaverDidChange:(NSDictionary *)change;
+- (void) aboutPanel: (id)sender;
 
-#ifdef USE_IPHONE
-- (void) loadSaverMenu: (id)sender;
+#ifndef USE_IPHONE
+- (void) openPreferences: (id)sender;
+#else  // USE_IPHONE
+- (void) openPreferences: (NSString *)which;
 - (UIImage *) screenshot;
-#endif
+#endif // USE_IPHONE
 
 @end