X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FSaverRunner.h;h=35d22354761c410b581fa2489d3c394598b12e28;hb=d5186197bc394e10a4402f7f6d23fbb14103bc50;hp=0a35ca195fe6a9a6a2f344e3039fda247451405a;hpb=6f5482d73adb0165c0130bb47d852644ab0c4869;p=xscreensaver

diff --git a/OSX/SaverRunner.h b/OSX/SaverRunner.h
index 0a35ca19..35d22354 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-2014 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
@@ -44,16 +44,24 @@
   NSBundle *saverBundle;
   NSArray  *windows;
   IBOutlet NSMenu *menubar;
+  NSTimer *anim_timer;
 
 # else  // USE_IPHONE
 
-  ScreenSaverView *saverView;
-  UINavigationController *rootViewController;
+  UINavigationController *rotating_nav;		// Hierarchy 1 (UI)
   IBOutlet UIWindow *window;
+  IBOutlet UIView *view;
+
+  UINavigationController *nonrotating_nav;	// Hierarchy 2 (savers)
+  UIWindow *saverWindow;
+  UIView *backgroundView;
+  ScreenSaverView *saverView;
+
   EAGLContext *eagl_ctx;
   GLuint gl_framebuffer, gl_renderbuffer;
-  IBOutlet UIView *view;
   UIImage *saved_screenshot;
+  UIView *aboutBox;
+  NSTimer *splashTimer;
 
 # endif // USE_IPHONE
 }
@@ -61,9 +69,9 @@
 - (void) loadSaver: (NSString *)name launch:(BOOL)launch;
 - (void) loadSaver: (NSString *)name;
 - (void) selectedSaverDidChange:(NSDictionary *)change;
+- (void) aboutPanel: (id)sender;
 
 #ifndef USE_IPHONE
-- (void) aboutPanel: (id)sender;
 - (void) openPreferences: (id)sender;
 #else  // USE_IPHONE
 - (void) openPreferences: (NSString *)which;