X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2FSaverRunner.h;h=35d22354761c410b581fa2489d3c394598b12e28;hp=c58e2b331a4437e2908008c9ce3f515f6cc17298;hb=d5186197bc394e10a4402f7f6d23fbb14103bc50;hpb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e diff --git a/OSX/SaverRunner.h b/OSX/SaverRunner.h index c58e2b33..35d22354 100644 --- a/OSX/SaverRunner.h +++ b/OSX/SaverRunner.h @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2006-2013 Jamie Zawinski +/* xscreensaver, Copyright (c) 2006-2014 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -48,13 +48,17 @@ # else // USE_IPHONE - ScreenSaverView *saverView; - UIView *backgroundView; - 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;