[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [275] branches/fusegl/fuse/fusepb

[<fr...@us...>]

Revision: 275
          http://svn.sourceforge.net/fuse-for-macosx/?rev=275&view=rev
Author:   fredm
Date:     2006-12-31 23:24:18 -0800 (Sun, 31 Dec 2006)

Log Message:
-----------
Move transformer intantiation back to PreferencesController.

Modified Paths:
--------------
    branches/fusegl/fuse/fusepb/controllers/PreferencesController.h
    branches/fusegl/fuse/fusepb/controllers/PreferencesController.m
    branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
    branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m

Modified: branches/fusegl/fuse/fusepb/controllers/PreferencesController.h
===================================================================
--- branches/fusegl/fuse/fusepb/controllers/PreferencesController.h	2007-01-01 07:15:54 UTC (rev 274)
+++ branches/fusegl/fuse/fusepb/controllers/PreferencesController.h	2007-01-01 07:24:18 UTC (rev 275)
@@ -40,7 +40,8 @@
 
   NSMutableArray *machineRoms;
 }
-- (void)awakeFromNib;
++ (void)initialize;
+
 - (void)windowDidLoad;
 - (void)windowDidMove:(NSNotification *)aNotification;
 - (void)showWindow:(id)sender;

Modified: branches/fusegl/fuse/fusepb/controllers/PreferencesController.m
===================================================================
--- branches/fusegl/fuse/fusepb/controllers/PreferencesController.m	2007-01-01 07:15:54 UTC (rev 274)
+++ branches/fusegl/fuse/fusepb/controllers/PreferencesController.m	2007-01-01 07:24:18 UTC (rev 275)
@@ -36,6 +36,11 @@
 #import "Joysticks.h"
 #import "HIDJoysticks.h"
 
+#import "ScalerNameToIdTransformer.h"
+#import "MachineScalerIsEnabled.h"
+#import "MachineNameToIdTransformer.h"
+#import "VolumeSliderToPrefTransformer.h"
+
 #include "fuse.h"
 #include "joystick.h"
 #include "printer.h"
@@ -51,8 +56,42 @@
 
 @implementation PreferencesController
 
-- (void)awakeFromNib
++(void) initialize
 {
+  ScalerNameToIdTransformer *sNToITransformer;
+  MachineScalerIsEnabled *machineScalerIsEnabled;
+  MachineNameToIdTransformer *mToITransformer;
+  VolumeSliderToPrefTransformer *vsToPTransformer;
+
+  sNToITransformer = [[[ScalerNameToIdTransformer alloc] init] autorelease];
+
+  [NSValueTransformer setValueTransformer:sNToITransformer
+                                  forName:@"ScalerNameToIdTransformer"];
+
+  machineScalerIsEnabled = [[MachineScalerIsEnabled
+                                machineScalerIsEnabledWithInt:1]
+                                                          autorelease];
+
+  [NSValueTransformer setValueTransformer:machineScalerIsEnabled
+                                  forName:@"MachineTimexIsEnabled"];
+
+  machineScalerIsEnabled = [[MachineScalerIsEnabled
+                                machineScalerIsEnabledWithInt:0]
+                                                          autorelease];
+
+  [NSValueTransformer setValueTransformer:machineScalerIsEnabled
+                                  forName:@"MachineTimexIsDisabled"];
+
+  mToITransformer = [[[MachineNameToIdTransformer alloc] init] autorelease];
+
+  [NSValueTransformer setValueTransformer:mToITransformer
+                                  forName:@"MachineNameToIdTransformer"];
+								  
+  vsToPTransformer = [[[VolumeSliderToPrefTransformer alloc] init] autorelease];
+
+  [NSValueTransformer setValueTransformer:vsToPTransformer
+                                  forName:@"VolumeSliderToPrefTransformer"];
+
 }
 
 - (void)windowDidLoad 

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-01-01 07:15:54 UTC (rev 274)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.h	2007-01-01 07:24:18 UTC (rev 275)
@@ -24,10 +24,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include <OpenGL/gl.h>
-#include <OpenGL/glext.h>
-#include <OpenGL/glu.h>
-
 #include <libspectrum.h>
 
 #include "input.h"
@@ -60,7 +56,6 @@
   float target_ratio;
 }
 +(DisplayOpenGLView *) instance;
-+(void) initialize;
 
 -(IBAction) fullscreen:(id)sender;
 

Modified: branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-01-01 07:15:54 UTC (rev 274)
+++ branches/fusegl/fuse/fusepb/views/DisplayOpenGLView.m	2007-01-01 07:24:18 UTC (rev 275)
@@ -23,11 +23,11 @@
 */
 
 #import "DisplayOpenGLView.h"
-#import "ScalerNameToIdTransformer.h"
-#import "MachineScalerIsEnabled.h"
-#import "MachineNameToIdTransformer.h"
-#import "VolumeSliderToPrefTransformer.h"
 
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
+#include <OpenGL/glu.h>
+
 #include "event.h"
 #include "fuse.h"
 #include "fusepb/main.h"
@@ -50,44 +50,6 @@
   return instance;
 }
 
-+(void) initialize
-{
-  ScalerNameToIdTransformer *sNToITransformer;
-  MachineScalerIsEnabled *machineScalerIsEnabled;
-  MachineNameToIdTransformer *mToITransformer;
-  VolumeSliderToPrefTransformer *vsToPTransformer;
-
-  sNToITransformer = [[[ScalerNameToIdTransformer alloc] init] autorelease];
-
-  [NSValueTransformer setValueTransformer:sNToITransformer
-                                  forName:@"ScalerNameToIdTransformer"];
-
-  machineScalerIsEnabled = [[MachineScalerIsEnabled
-                                machineScalerIsEnabledWithInt:1]
-                                                          autorelease];
-
-  [NSValueTransformer setValueTransformer:machineScalerIsEnabled
-                                  forName:@"MachineTimexIsEnabled"];
-
-  machineScalerIsEnabled = [[MachineScalerIsEnabled
-                                machineScalerIsEnabledWithInt:0]
-                                                          autorelease];
-
-  [NSValueTransformer setValueTransformer:machineScalerIsEnabled
-                                  forName:@"MachineTimexIsDisabled"];
-
-  mToITransformer = [[[MachineNameToIdTransformer alloc] init] autorelease];
-
-  [NSValueTransformer setValueTransformer:mToITransformer
-                                  forName:@"MachineNameToIdTransformer"];
-								  
-  vsToPTransformer = [[[VolumeSliderToPrefTransformer alloc] init] autorelease];
-
-  [NSValueTransformer setValueTransformer:vsToPTransformer
-                                  forName:@"VolumeSliderToPrefTransformer"];
-
-}
-
 -(IBAction) fullscreen:(id)sender
 {
   if( settings_current.full_screen == 1 ) {   // we need to go back to non-full screen


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.