open

diff --git a/Elis Colors.xcodeproj/project.pbxproj b/Elis Colors.xcodeproj/project.pbxproj
index 8fe4316..34d742b 100644 (file)
--- a/Elis Colors.xcodeproj/project.pbxproj
+++ b/Elis Colors.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
                1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
                256AC3DA0F4B6AC300CF3369 /* Elis_ColorsAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* Elis_ColorsAppDelegate.m */; };
 /* Begin PBXBuildFile section */
                1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
                256AC3DA0F4B6AC300CF3369 /* Elis_ColorsAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* Elis_ColorsAppDelegate.m */; };

-               5C01A8C11064ACFB0076B735 /* MainMenuForSmallDisplay.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C01A8BF1064ACFB0076B735 /* MainMenuForSmallDisplay.xib */; };

                5C0DDDC5106B5652008425EE /* ElisUndoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C0DDDC4106B5652008425EE /* ElisUndoManager.m */; };
                5C480238106D165B00DF0CBB /* movieSizeWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C480236106D165B00DF0CBB /* movieSizeWindow.xib */; };
                5C56077F105FB3B70094F837 /* ElisPropertyTableController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C56077E105FB3B70094F837 /* ElisPropertyTableController.m */; };
                5C0DDDC5106B5652008425EE /* ElisUndoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C0DDDC4106B5652008425EE /* ElisUndoManager.m */; };
                5C480238106D165B00DF0CBB /* movieSizeWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C480236106D165B00DF0CBB /* movieSizeWindow.xib */; };
                5C56077F105FB3B70094F837 /* ElisPropertyTableController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C56077E105FB3B70094F837 /* ElisPropertyTableController.m */; };


@@ -19,6 +18,8 @@
                5C72E72E106E0BC100A96925 /* WriterProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C72E72C106E0BC100A96925 /* WriterProgress.xib */; };
                5C72E74C106E0CE800A96925 /* ElisWriterDummyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C72E74B106E0CE800A96925 /* ElisWriterDummyView.m */; };
                5C808D6A105CDA6800818B1A /* ElisCustomCALayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C808D69105CDA6800818B1A /* ElisCustomCALayer.m */; };
                5C72E72E106E0BC100A96925 /* WriterProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C72E72C106E0BC100A96925 /* WriterProgress.xib */; };
                5C72E74C106E0CE800A96925 /* ElisWriterDummyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C72E74B106E0CE800A96925 /* ElisWriterDummyView.m */; };
                5C808D6A105CDA6800818B1A /* ElisCustomCALayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C808D69105CDA6800818B1A /* ElisCustomCALayer.m */; };

+               5C8588CA1071095A00802903 /* speed.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C8588C81071095A00802903 /* speed.xib */; };
+               5C8588CE107109E800802903 /* ElisMovieSpeedController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C8588CD107109E800802903 /* ElisMovieSpeedController.m */; };

                5C8A4811106A66ED00EC2F3D /* ElisWriterLegacy.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C8A4810106A66ED00EC2F3D /* ElisWriterLegacy.m */; };
                5C9F358B105F7BEA00D87A46 /* ElisEffect.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C9F358A105F7BEA00D87A46 /* ElisEffect.m */; };
                5C9F358E105F7C0F00D87A46 /* ElisKeyframe.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C9F358D105F7C0F00D87A46 /* ElisKeyframe.m */; };
                5C8A4811106A66ED00EC2F3D /* ElisWriterLegacy.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C8A4810106A66ED00EC2F3D /* ElisWriterLegacy.m */; };
                5C9F358B105F7BEA00D87A46 /* ElisEffect.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C9F358A105F7BEA00D87A46 /* ElisEffect.m */; };
                5C9F358E105F7C0F00D87A46 /* ElisKeyframe.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C9F358D105F7C0F00D87A46 /* ElisKeyframe.m */; };


@@ -60,7 +61,6 @@
                29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
                29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
                29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
                29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
                29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
                29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };

-               5C01A8C01064ACFB0076B735 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenuForSmallDisplay.xib; sourceTree = "<group>"; };

                5C0DDDC3106B5652008425EE /* ElisUndoManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisUndoManager.h; sourceTree = "<group>"; };
                5C0DDDC4106B5652008425EE /* ElisUndoManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisUndoManager.m; sourceTree = "<group>"; };
                5C480237106D165B00DF0CBB /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/movieSizeWindow.xib; sourceTree = "<group>"; };
                5C0DDDC3106B5652008425EE /* ElisUndoManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisUndoManager.h; sourceTree = "<group>"; };
                5C0DDDC4106B5652008425EE /* ElisUndoManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisUndoManager.m; sourceTree = "<group>"; };
                5C480237106D165B00DF0CBB /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/movieSizeWindow.xib; sourceTree = "<group>"; };


@@ -76,6 +76,9 @@
                5C72E74B106E0CE800A96925 /* ElisWriterDummyView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisWriterDummyView.m; sourceTree = "<group>"; };
                5C808D68105CDA6800818B1A /* ElisCustomCALayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisCustomCALayer.h; sourceTree = "<group>"; };
                5C808D69105CDA6800818B1A /* ElisCustomCALayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisCustomCALayer.m; sourceTree = "<group>"; };
                5C72E74B106E0CE800A96925 /* ElisWriterDummyView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisWriterDummyView.m; sourceTree = "<group>"; };
                5C808D68105CDA6800818B1A /* ElisCustomCALayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisCustomCALayer.h; sourceTree = "<group>"; };
                5C808D69105CDA6800818B1A /* ElisCustomCALayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisCustomCALayer.m; sourceTree = "<group>"; };

+               5C8588C91071095A00802903 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/speed.xib; sourceTree = "<group>"; };
+               5C8588CC107109E800802903 /* ElisMovieSpeedController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisMovieSpeedController.h; sourceTree = "<group>"; };
+               5C8588CD107109E800802903 /* ElisMovieSpeedController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisMovieSpeedController.m; sourceTree = "<group>"; };

                5C8A480F106A66ED00EC2F3D /* ElisWriterLegacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisWriterLegacy.h; sourceTree = "<group>"; };
                5C8A4810106A66ED00EC2F3D /* ElisWriterLegacy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisWriterLegacy.m; sourceTree = "<group>"; };
                5C9F3589105F7BEA00D87A46 /* ElisEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisEffect.h; sourceTree = "<group>"; };
                5C8A480F106A66ED00EC2F3D /* ElisWriterLegacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisWriterLegacy.h; sourceTree = "<group>"; };
                5C8A4810106A66ED00EC2F3D /* ElisWriterLegacy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElisWriterLegacy.m; sourceTree = "<group>"; };
                5C9F3589105F7BEA00D87A46 /* ElisEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElisEffect.h; sourceTree = "<group>"; };


@@ -207,10 +210,10 @@
                                29B97317FDCFA39411CA2CEA /* Resources */,
                                29B97323FDCFA39411CA2CEA /* Frameworks */,
                                19C28FACFE9D520D11CA2CBB /* Products */,
                                29B97317FDCFA39411CA2CEA /* Resources */,
                                29B97323FDCFA39411CA2CEA /* Frameworks */,
                                19C28FACFE9D520D11CA2CBB /* Products */,

-                               5C01A8BF1064ACFB0076B735 /* MainMenuForSmallDisplay.xib */,

                                5C480236106D165B00DF0CBB /* movieSizeWindow.xib */,
                                5C72E687106DED1600A96925 /* Preference.xib */,
                                5C72E72C106E0BC100A96925 /* WriterProgress.xib */,
                                5C480236106D165B00DF0CBB /* movieSizeWindow.xib */,
                                5C72E687106DED1600A96925 /* Preference.xib */,
                                5C72E72C106E0BC100A96925 /* WriterProgress.xib */,

+                               5C8588C81071095A00802903 /* speed.xib */,

                        );
                        name = "Elis Colors";
                        sourceTree = "<group>";
                        );
                        name = "Elis Colors";
                        sourceTree = "<group>";


@@ -285,6 +288,8 @@
                                5C72E60A106DD74000A96925 /* ElisMovieSizeWindowController.m */,
                                5C72E68A106DF1D400A96925 /* ElisPreferenceController.h */,
                                5C72E68B106DF1D400A96925 /* ElisPreferenceController.m */,
                                5C72E60A106DD74000A96925 /* ElisMovieSizeWindowController.m */,
                                5C72E68A106DF1D400A96925 /* ElisPreferenceController.h */,
                                5C72E68B106DF1D400A96925 /* ElisPreferenceController.m */,

+                               5C8588CC107109E800802903 /* ElisMovieSpeedController.h */,
+                               5C8588CD107109E800802903 /* ElisMovieSpeedController.m */,

                        );
                        name = "Sub GUI Parts";
                        sourceTree = "<group>";
                        );
                        name = "Sub GUI Parts";
                        sourceTree = "<group>";


@@ -379,12 +384,12 @@
                                5CE26AD9105BD8F20082C63A /* skyblue.jpg in Resources */,
                                5CB6798C10637CA400FC5F9F /* lightgreen.jpg in Resources */,
                                5CB6798D10637CA400FC5F9F /* orange.jpg in Resources */,
                                5CE26AD9105BD8F20082C63A /* skyblue.jpg in Resources */,
                                5CB6798C10637CA400FC5F9F /* lightgreen.jpg in Resources */,
                                5CB6798D10637CA400FC5F9F /* orange.jpg in Resources */,

-                               5C01A8C11064ACFB0076B735 /* MainMenuForSmallDisplay.xib in Resources */,

                                5C480238106D165B00DF0CBB /* movieSizeWindow.xib in Resources */,
                                5C72E689106DED1600A96925 /* Preference.xib in Resources */,
                                5C72E72E106E0BC100A96925 /* WriterProgress.xib in Resources */,
                                5CB942B4106E675B0050FB6B /* trackgray.jpg in Resources */,
                                5CB942B6106E677E0050FB6B /* white.jpg in Resources */,
                                5C480238106D165B00DF0CBB /* movieSizeWindow.xib in Resources */,
                                5C72E689106DED1600A96925 /* Preference.xib in Resources */,
                                5C72E72E106E0BC100A96925 /* WriterProgress.xib in Resources */,
                                5CB942B4106E675B0050FB6B /* trackgray.jpg in Resources */,
                                5CB942B6106E677E0050FB6B /* white.jpg in Resources */,

+                               5C8588CA1071095A00802903 /* speed.xib in Resources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -417,6 +422,7 @@
                                5C72E74C106E0CE800A96925 /* ElisWriterDummyView.m in Sources */,
                                5CB9424D106E662F0050FB6B /* ElisCoreImageKernel.cikernel in Sources */,
                                5CB9424E106E662F0050FB6B /* ElisCustomFilter.m in Sources */,
                                5C72E74C106E0CE800A96925 /* ElisWriterDummyView.m in Sources */,
                                5CB9424D106E662F0050FB6B /* ElisCoreImageKernel.cikernel in Sources */,
                                5CB9424E106E662F0050FB6B /* ElisCustomFilter.m in Sources */,

+                               5C8588CE107109E800802903 /* ElisMovieSpeedController.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -439,14 +445,6 @@
                        name = MainMenu.xib;
                        sourceTree = "<group>";
                };
                        name = MainMenu.xib;
                        sourceTree = "<group>";
                };

-               5C01A8BF1064ACFB0076B735 /* MainMenuForSmallDisplay.xib */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               5C01A8C01064ACFB0076B735 /* English */,
-                       );
-                       name = MainMenuForSmallDisplay.xib;
-                       sourceTree = "<group>";
-               };

                5C480236106D165B00DF0CBB /* movieSizeWindow.xib */ = {
                        isa = PBXVariantGroup;
                        children = (
                5C480236106D165B00DF0CBB /* movieSizeWindow.xib */ = {
                        isa = PBXVariantGroup;
                        children = (


@@ -471,6 +469,14 @@
                        name = WriterProgress.xib;
                        sourceTree = "<group>";
                };
                        name = WriterProgress.xib;
                        sourceTree = "<group>";
                };

+               5C8588C81071095A00802903 /* speed.xib */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               5C8588C91071095A00802903 /* English */,
+                       );
+                       name = speed.xib;
+                       sourceTree = "<group>";
+               };

 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */


@@ -480,10 +486,12 @@
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_ENABLE_OBJC_GC = required;
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_ENABLE_OBJC_GC = required;

+                               GCC_OPTIMIZATION_LEVEL = 3;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                PREBINDING = NO;
                                SDKROOT = macosx10.5;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                PREBINDING = NO;
                                SDKROOT = macosx10.5;

+                               VALID_ARCHS = "i386 x86_64";

                        };
                        name = "Release (Leopard)";
                };
                        };
                        name = "Release (Leopard)";
                };


@@ -495,6 +503,7 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                GCC_ENABLE_OBJC_GC = required;
                                GCC_MODEL_TUNING = G5;
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                GCC_ENABLE_OBJC_GC = required;
                                GCC_MODEL_TUNING = G5;

+                               GCC_OPTIMIZATION_LEVEL = s;

                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = Elis_Colors_Prefix.pch;
                                INFOPLIST_FILE = "Elis_Colors-Info.plist";
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = Elis_Colors_Prefix.pch;
                                INFOPLIST_FILE = "Elis_Colors-Info.plist";

diff --git a/ElisBase.h b/ElisBase.h
index e73130e..8d89ed6 100644 (file)
--- a/ElisBase.h
+++ b/ElisBase.h
@@ -40,7 +40,9 @@
 
 // GCD使ったら表示がちらつくようになった。どういうことなの...
 
 
 // GCD使ったら表示がちらつくようになった。どういうことなの...
 

-#define __SNOW_LEOPARD__
+#define ELIS_VERSION @"0.1"
+
+//#define __SNOW_LEOPARD__

 //#define __SNOW_LEOPARD_GCD__
 
 #ifdef __SNOW_LEOPARD_GCD__
 //#define __SNOW_LEOPARD_GCD__
 
 #ifdef __SNOW_LEOPARD_GCD__

diff --git a/ElisController.h b/ElisController.h
index e647346..053bce0 100644 (file)
--- a/ElisController.h
+++ b/ElisController.h
@@ -46,6 +46,7 @@
 #import "ElisUndoManager.h"
 #import "ElisMovieSizeWindowController.h"
 #import "ElisPreferenceController.h"
 #import "ElisUndoManager.h"
 #import "ElisMovieSizeWindowController.h"
 #import "ElisPreferenceController.h"

+#import "ElisMovieSpeedController.h"

 
 @class ElisMainView, ElisTimeLineController, ElisPropertyTableController;
 
 
 @class ElisMainView, ElisTimeLineController, ElisPropertyTableController;
 


@@ -64,6 +65,7 @@ BOOL usingStampMode;
     IBOutlet NSWindow* _mainWindow;
     IBOutlet ElisUndoManager* _undoManager;
     IBOutlet NSTextView* _textLayerField;
     IBOutlet NSWindow* _mainWindow;
     IBOutlet ElisUndoManager* _undoManager;
     IBOutlet NSTextView* _textLayerField;

+    IBOutlet NSButton* _playstopButton;

     
     float hipTime;
     QTTime _currentTime;
     
     float hipTime;
     QTTime _currentTime;


@@ -81,6 +83,7 @@ BOOL usingStampMode;
 
 - (float)getHipTime;
 
 
 - (float)getHipTime;
 

+- (IBAction)playStop:(id)sender;

 - (IBAction)startPlay:(id)sender;
 - (IBAction)stopPlay:(id)sender;
 - (IBAction)timeSliderChanged:(id)sender;
 - (IBAction)startPlay:(id)sender;
 - (IBAction)stopPlay:(id)sender;
 - (IBAction)timeSliderChanged:(id)sender;


@@ -102,6 +105,9 @@ BOOL usingStampMode;
 - (IBAction)preference:(id)sender;
 
 - (IBAction)changeToSmallWindiw:(id)sender;
 - (IBAction)preference:(id)sender;
 
 - (IBAction)changeToSmallWindiw:(id)sender;

-
+- (IBAction)changeMovieSpeed:(id)sender;
+- (IBAction)gotoNextKeyTime:(id)sender;
+- (IBAction)gotoPrevKeyTime:(id)sender;
+- (IBAction)cutLayerAtCurrentTime:(id)sender;

 
 @end
 
 @end

diff --git a/ElisController.m b/ElisController.m
index 2be0571..9105c02 100644 (file)
--- a/ElisController.m
+++ b/ElisController.m
@@ -140,6 +140,7 @@ static float convertQTTimeToSecond(QTTime t)
     if(convertQTTimeToSecond(qttime) >= hipTime){
         [_mainView stopDisplayLink];
         [self stop:qttime];
     if(convertQTTimeToSecond(qttime) >= hipTime){
         [_mainView stopDisplayLink];
         [self stop:qttime];

+        [_playstopButton setState:NSOffState];

         return;
     }
     
         return;
     }
     


@@ -427,7 +428,7 @@ static float convertQTTimeToSecond(QTTime t)
     [[l valueForKey:@"ElisLayer"] addEffect:[sender title]];
     [self refresh];
     [_tableController createPropertyTable:[l valueForKey:@"ElisLayer"]];
     [[l valueForKey:@"ElisLayer"] addEffect:[sender title]];
     [self refresh];
     [_tableController createPropertyTable:[l valueForKey:@"ElisLayer"]];

-    [_undoManager pushOperation:l];
+    [_undoManager pushOperation:[l valueForKey:@"ElisLayer"]];

     [_tableController reload];
 }
 
     [_tableController reload];
 }
 


@@ -438,6 +439,9 @@ static float convertQTTimeToSecond(QTTime t)
     NSKeyedArchiver* encoder = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
     
     [encoder encodeObject:layers forKey:@"layers"];
     NSKeyedArchiver* encoder = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
     
     [encoder encodeObject:layers forKey:@"layers"];

+    [encoder encodeFloat:ProjectMovieSize.size.width forKey:@"movieWidth"];
+    [encoder encodeFloat:ProjectMovieSize.size.height forKey:@"movieHeight"];
+    [encoder encodeObject:ELIS_VERSION forKey:@"version"];

     [encoder finishEncoding];
     
     savePath = path;
     [encoder finishEncoding];
     
     savePath = path;


@@ -449,18 +453,24 @@ static float convertQTTimeToSecond(QTTime t)
 {
     NSMutableData* data = [NSMutableData dataWithContentsOfFile:path];
     NSKeyedUnarchiver* decoder = [[NSKeyedUnarchiver alloc] initForReadingWithData:data];
 {
     NSMutableData* data = [NSMutableData dataWithContentsOfFile:path];
     NSKeyedUnarchiver* decoder = [[NSKeyedUnarchiver alloc] initForReadingWithData:data];

+    float w, h;

     
     [_timeLineController awakeFromNib]; // これはひどい。
     layers = [decoder decodeObjectForKey:@"layers"];
     
     [_timeLineController awakeFromNib]; // これはひどい。
     layers = [decoder decodeObjectForKey:@"layers"];

+    w = [decoder decodeFloatForKey:@"movieWidth"];
+    h = [decoder decodeFloatForKey:@"movieHeight"];

     [decoder finishDecoding];
     
     [decoder finishDecoding];
     

+    ProjectMovieSize.size.width = w;
+    ProjectMovieSize.size.height = h;
+    

     int i, size = [layers count];
     ElisLayer* l;
     CALayer* al;
     
     for(i = 0; i < size; i++){
         l = [layers objectAtIndex:i];
     int i, size = [layers count];
     ElisLayer* l;
     CALayer* al;
     
     for(i = 0; i < size; i++){
         l = [layers objectAtIndex:i];

-        al = [_animationLayerFactory createNewAnimationLayer:[l duration] name:[l getPath] type:[l getType]];
+        al = [_animationLayerFactory createNewAnimationLayer:[l duration] name:[l printName] type:[l getType]];

         [l setLayer:al];
         [_timeLineController addLayer:al];
     }
         [l setLayer:al];
         [_timeLineController addLayer:al];
     }


@@ -514,6 +524,12 @@ static float convertQTTimeToSecond(QTTime t)
     if([menuItem action] == @selector(redo:))
         return [_undoManager canRedo];
     
     if([menuItem action] == @selector(redo:))
         return [_undoManager canRedo];
     

+    if([menuItem action] == @selector(changeMovieSpeed:))
+        return [self canChangeMovieSpeed];
+    
+    if([menuItem action] == @selector(cutLayerAtCurrentTime:))
+        return [_timeLineController canDeleteLayer];
+    

     return YES;
 }
 
     return YES;
 }
 


@@ -523,6 +539,8 @@ static float convertQTTimeToSecond(QTTime t)
     NSKeyedArchiver* encoder = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
     
     [encoder encodeObject:layers forKey:@"layers"];
     NSKeyedArchiver* encoder = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
     
     [encoder encodeObject:layers forKey:@"layers"];

+    [encoder encodeFloat:ProjectMovieSize.size.width forKey:@"movieWidth"];
+    [encoder encodeFloat:ProjectMovieSize.size.height forKey:@"movieHeight"];

     [encoder finishEncoding];
     
     [data writeToFile:savePath atomically:YES];
     [encoder finishEncoding];
     
     [data writeToFile:savePath atomically:YES];


@@ -585,4 +603,106 @@ static float convertQTTimeToSecond(QTTime t)
     
 }
 
     
 }
 

+- (IBAction)changeMovieSpeed:(id)sender
+{
+    ElisMovieSpeedController* c;
+    c = [[ElisMovieSpeedController alloc] init];
+    
+    [_undoManager pushOperation:[[_timeLineController getSelectLayer] valueForKey:@"ElisLayer"]];
+    
+    [c setMainWindow:_mainWindow];
+    [c setLayer:[[_timeLineController getSelectLayer] valueForKey:@"ElisLayer"]];
+    [c run];
+    
+    [self refresh];
+}
+
+- (BOOL)canChangeMovieSpeed
+{
+    CALayer* l;
+    l = [_timeLineController getSelectLayer];
+    if(l == nil) return NO;
+    if([[[[l valueForKey:@"ElisLayer"] media] type] isEqualToString:@"movie"]) return YES;
+    return NO;
+}
+
+- (IBAction)gotoNextKeyTime:(id)sender
+{
+    float currentTime = [self getHipTime] * [timeSlider floatValue];
+    NSMutableArray* array = [[NSMutableArray alloc] init];
+    ElisLayer* l;
+    QTTime nextTime;
+    int i, size = [layers count];
+    
+    for(i = 0; i < size; i++){
+        [array addObject:[NSNumber numberWithFloat:0.0]];
+        [array addObject:[NSNumber numberWithFloat:convertQTTimeToSecond([[layers objectAtIndex:i] mapping].time)]];
+        [array addObject:[NSNumber numberWithFloat:convertQTTimeToSecond([[layers objectAtIndex:i] mapping].time) + 
+                          convertQTTimeToSecond([[layers objectAtIndex:i] mapping].duration)]];
+    }
+    
+    [array sortUsingSelector:@selector(compare:)];
+    size = [array count];
+    
+    for(i = 0; i < size; i++)
+        if([[array objectAtIndex:i] floatValue] > currentTime){
+            nextTime = QTMakeTime(([[array objectAtIndex:i] floatValue] +1.0/60.0)* DEFAULT_FPS, DEFAULT_FPS);
+            globalCurrentTime = nextTime;
+            _currentTime = nextTime;
+            [self moveSliderTo:nextTime];
+            [self refresh];
+            return;
+        }
+}
+
+- (IBAction)gotoPrevKeyTime:(id)sender
+{
+    float currentTime = [self getHipTime] * [timeSlider floatValue];
+    NSMutableArray* array = [[NSMutableArray alloc] init];
+    ElisLayer* l;
+    QTTime nextTime;
+    int i, size = [layers count];
+    
+    for(i = 0; i < size; i++){
+        [array addObject:[NSNumber numberWithFloat:0.0]];
+        [array addObject:[NSNumber numberWithFloat:convertQTTimeToSecond([[layers objectAtIndex:i] mapping].time)]];
+        [array addObject:[NSNumber numberWithFloat:convertQTTimeToSecond([[layers objectAtIndex:i] mapping].time) + 
+                          convertQTTimeToSecond([[layers objectAtIndex:i] mapping].duration)]];
+    }
+    
+    [array sortUsingSelector:@selector(compare:)];
+    size = [array count];
+    
+    for(i = size-1; i >= 0; i--)
+        if([[array objectAtIndex:i] floatValue] < currentTime){
+//            if(i % 2 != 0)
+//                nextTime = QTMakeTime(([[array objectAtIndex:i] floatValue] -1.0/60)* DEFAULT_FPS, DEFAULT_FPS);
+//            else
+//                nextTime = QTMakeTime(([[array objectAtIndex:i] floatValue] +1.0/60)* DEFAULT_FPS, DEFAULT_FPS);
+            nextTime = QTMakeTime(([[array objectAtIndex:i] floatValue] +0.0/60)* DEFAULT_FPS, DEFAULT_FPS);
+            globalCurrentTime = nextTime;
+            _currentTime = nextTime;
+            [self moveSliderTo:nextTime];
+            [self refresh];
+            return;
+        }
+}
+
+- (IBAction)cutLayerAtCurrentTime:(id)sender
+{
+    ElisLayer* layer = [[_timeLineController getSelectLayer] valueForKey:@"ElisLayer"];
+    ElisLayer* new;
+
+    new = [layer cutAtTime:globalCurrentTime];
+    [layers addObject:new];
+    
+    [_timeLineController addLayer:[new alayer]];
+}
+
+- (IBAction)playStop:(id)sender
+{
+    if(playing) [self stopPlay:nil];
+    else [self startPlay:nil];
+}
+

 @end
 @end

diff --git a/ElisEffect.m b/ElisEffect.m
index de87a4a..de1fd2f 100644 (file)
--- a/ElisEffect.m
+++ b/ElisEffect.m
@@ -52,38 +52,35 @@
             continue;
         }
         input = [attrs valueForKey:key];
             continue;
         }
         input = [attrs valueForKey:key];

-        if([[[attrs valueForKey:key] valueForKey:kCIAttributeClass] isEqualToString:@"CIColor"]){    
+        if([[[attrs valueForKey:key] valueForKey:kCIAttributeClass] isEqualToString:@"CIColor"]){
+            [colors addObject:key];
+            [colors addObject:[NSString stringWithFormat:@"%@ %@", key, @"red"]];
+            [colors addObject:[NSString stringWithFormat:@"%@ %@", key, @"green"]];
+            [colors addObject:[NSString stringWithFormat:@"%@ %@", key, @"blue"]];

             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"red"] value:1.0 time:QTZeroTime];
             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"green"] value:1.0 time:QTZeroTime];
             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"blue"] value:1.0 time:QTZeroTime];
             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"red"] value:1.0 time:QTZeroTime];
             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"green"] value:1.0 time:QTZeroTime];
             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"blue"] value:1.0 time:QTZeroTime];

-            [colors addObject:key];
-            [colors addObject:[NSString stringWithFormat:@"%@ %@", key, @"red"]];
-            [colors addObject:[NSString stringWithFormat:@"%@ %@", key, @"green"]];
-            [colors addObject:[NSString stringWithFormat:@"%@ %@", key, @"blue"]];

         }
         else if([[[attrs valueForKey:key] valueForKey:kCIAttributeClass] isEqualToString:@"CIVector"]){
         }
         else if([[[attrs valueForKey:key] valueForKey:kCIAttributeClass] isEqualToString:@"CIVector"]){

+            [vecs addObject:key];
+            [vecs addObject:[NSString stringWithFormat:@"%@ %@", key, @"X"]];
+            [vecs addObject:[NSString stringWithFormat:@"%@ %@", key, @"Y"]];

             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"X"] value:[[input valueForKey:kCIAttributeDefault] X] time:QTZeroTime];
             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"Y"] value:[[input valueForKey:kCIAttributeDefault] Y] time:QTZeroTime];
             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"X"] value:[[input valueForKey:kCIAttributeDefault] X] time:QTZeroTime];
             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"Y"] value:[[input valueForKey:kCIAttributeDefault] Y] time:QTZeroTime];

-            [vecs addObject:key];
-            [vecs addObject:[NSString stringWithFormat:@"%@ %@", key, @"X"]];
-            [vecs addObject:[NSString stringWithFormat:@"%@ %@", key, @"Y"]];

         }
         else if([[[attrs valueForKey:key] valueForKey:kCIAttributeClass] isEqualToString:@"NSAffineTransform"]){
         }
         else if([[[attrs valueForKey:key] valueForKey:kCIAttributeClass] isEqualToString:@"NSAffineTransform"]){

-//            [self setEffectTrueValueForTime:
-//             [NSString stringWithFormat:@"%@ %@", key, @"Position X"] value:0.0 time:QTZeroTime];
+            [affine addObject:key];
+            [affine addObject:[NSString stringWithFormat:@"%@ %@", key, @"Scale"]];
+            [affine addObject:[NSString stringWithFormat:@"%@ %@", key, @"Angle"]];

             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"Scale"] value:1.0 time:QTZeroTime];
             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"Angle"] value:0.0 time:QTZeroTime];
             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"Scale"] value:1.0 time:QTZeroTime];
             [self setEffectTrueValueForTime:
              [NSString stringWithFormat:@"%@ %@", key, @"Angle"] value:0.0 time:QTZeroTime];

-            [affine addObject:key];
-//            [affine addObject:[NSString stringWithFormat:@"%@ %@", key, @"Position X"]];
-            [affine addObject:[NSString stringWithFormat:@"%@ %@", key, @"Scale"]];
-            [affine addObject:[NSString stringWithFormat:@"%@ %@", key, @"Angle"]];

         }
         else if([[[attrs valueForKey:key] valueForKey:kCIAttributeClass] isEqualToString:@"NSNumber"]){  
             [self setEffectTrueValueForTime:key value:[[input valueForKey:kCIAttributeDefault] floatValue] time:QTZeroTime];
         }
         else if([[[attrs valueForKey:key] valueForKey:kCIAttributeClass] isEqualToString:@"NSNumber"]){  
             [self setEffectTrueValueForTime:key value:[[input valueForKey:kCIAttributeDefault] floatValue] time:QTZeroTime];


@@ -143,6 +140,29 @@
 - (void)setEffectTrueValueForTime:(NSString *)key value:(float)v time:(QTTime)time
 {
     ElisKeyframe *k;
 - (void)setEffectTrueValueForTime:(NSString *)key value:(float)v time:(QTTime)time
 {
     ElisKeyframe *k;

+    float max, min;
+    if([colors indexOfObject:key] != NSNotFound){
+        max = 255.0;
+        min = 0.0;
+    }else if([vecs indexOfObject:key] != NSNotFound){
+        max = ProjectMovieSize.size.width*2;
+        min = -ProjectMovieSize.size.width*2;
+    }else if([affine indexOfObject:key] != NSNotFound){
+        if([key isEqualToString:@"inputTransform Angle"]){
+            max = ANGLE_MAX;
+            min = ANGLE_MIN;
+        } else {
+            max = 5.0;
+            min = 0.1;
+        }
+    }else{
+        max = [[[attrs valueForKey:key] valueForKey:kCIAttributeSliderMax] floatValue];
+        min = [[[attrs valueForKey:key] valueForKey:kCIAttributeSliderMin] floatValue];
+    } 
+    
+    // min-maxに収まるようマップ
+    if(v < min) v = min;
+    if(v > max) v = max;

     
     if([params valueForKey:key]){
         k = [params valueForKey:key];
     
     if([params valueForKey:key]){
         k = [params valueForKey:key];

diff --git a/ElisLayer.h b/ElisLayer.h
index 74c6b0c..356deac 100644 (file)
--- a/ElisLayer.h
+++ b/ElisLayer.h
@@ -45,6 +45,7 @@
     QTTime offset; // 再生時間オフセット
     NSMutableArray* effects; // エフェクトの配列
     ElisKeyframe *pxKeyframe, *pyKeyframe; // Positionのキーフレーム
     QTTime offset; // 再生時間オフセット
     NSMutableArray* effects; // エフェクトの配列
     ElisKeyframe *pxKeyframe, *pyKeyframe; // Positionのキーフレーム

+    NSRect originSize; // 用意せざるをえない！

 }
 
 //@property (assign) QTTimeRange mapping; // マッピング情報。(QTTimeRange)
 }
 
 //@property (assign) QTTimeRange mapping; // マッピング情報。(QTTimeRange)


@@ -88,5 +89,9 @@
 - (void)saveToEncoder:(NSCoder*)encoder;
 - (void)loadFromDecoder:(NSCoder*)coder;
 
 - (void)saveToEncoder:(NSCoder*)encoder;
 - (void)loadFromDecoder:(NSCoder*)coder;
 

+- (NSSize)originSize;
+- (float)speed;
+- (void)setSpeed:(float)s;
+- (CALayer*)alayer;

 
 @end
 
 @end

diff --git a/ElisLayer.m b/ElisLayer.m
index d9df22a..7aff80a 100644 (file)
--- a/ElisLayer.m
+++ b/ElisLayer.m
@@ -52,6 +52,8 @@ static float convertQTTimeToSecond(QTTime t)
     [pxKeyframe setValueForTime:0.0 time:QTZeroTime];
     [pyKeyframe setValueForTime:0.0 time:QTZeroTime];
     
     [pxKeyframe setValueForTime:0.0 time:QTZeroTime];
     [pyKeyframe setValueForTime:0.0 time:QTZeroTime];
     

+    originSize = NSZeroRect;
+    

     [self addEffect:@"CIOpacity"]; //デフォルトで透過度フィルタと
 //    [self addEffect:@"CILanczosScaleTransform"]; // 拡大縮小フィルタと
     [self addEffect:@"CIAffineTransform"]; // アフィン変換フィルタはつけておく。
     [self addEffect:@"CIOpacity"]; //デフォルトで透過度フィルタと
 //    [self addEffect:@"CILanczosScaleTransform"]; // 拡大縮小フィルタと
     [self addEffect:@"CIAffineTransform"]; // アフィン変換フィルタはつけておく。


@@ -71,6 +73,8 @@ static float convertQTTimeToSecond(QTTime t)
             forKeyPath:@"frame" 
                options:(NSKeyValueObservingOptionNew) 
                context:NULL];
             forKeyPath:@"frame" 
                options:(NSKeyValueObservingOptionNew) 
                context:NULL];

+    
+    originSize = [media size];

 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context


@@ -148,6 +152,43 @@ static float convertQTTimeToSecond(QTTime t)
     return trackNumber;
 }
 
     return trackNumber;
 }
 

+- (ElisLayer*)cutAtTime:(QTTime)cutTime
+{
+    QTTime innerCutTime = [self convertToInnnerTime:cutTime];
+    ElisLayer* new;
+    NSKeyedArchiver* corder;
+    NSKeyedUnarchiver* decoder;
+    NSMutableData* data = [NSMutableData data];
+    
+    corder = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
+    [self encodeWithCoder:corder];
+    [corder finishEncoding];
+    
+    new = [ElisLayer alloc];
+    decoder = [[NSKeyedUnarchiver alloc] initForReadingWithData:data];
+    new = [new initWithCoder:decoder];
+    [decoder finishDecoding];
+    
+    mapping.duration = QTTimeDecrement(mapping.duration, cutTime);
+    [self setLayer:alayer];
+    
+    [new cutBack:innerCutTime];
+    return new;
+}
+
+- (void)cutBack:(QTTime)time
+{
+    offset = time;
+    mapping.time = time;
+    mapping.duration = QTTimeDecrement(mapping.duration, time);
+    [self setLayer:alayer];
+}
+
+- (CALayer*)alayer
+{
+    return alayer;
+}
+

 - (void)setPositionX:(float)x forTime:(QTTime)time
 {
     if(recording)
 - (void)setPositionX:(float)x forTime:(QTTime)time
 {
     if(recording)


@@ -361,6 +402,7 @@ static float convertQTTimeToSecond(QTTime t)
     [encoder encodeObject:effects forKey:@"effects"];
     [encoder encodeObject:pxKeyframe forKey:@"pxKeyframe"];
     [encoder encodeObject:pyKeyframe forKey:@"pyKeyframe"];
     [encoder encodeObject:effects forKey:@"effects"];
     [encoder encodeObject:pxKeyframe forKey:@"pxKeyframe"];
     [encoder encodeObject:pyKeyframe forKey:@"pyKeyframe"];

+    [encoder encodeFloat:[media speed] forKey:@"speed"];

 }
 
 - (void)loadFromDecoder:(NSCoder*)coder
 }
 
 - (void)loadFromDecoder:(NSCoder*)coder


@@ -371,6 +413,7 @@ static float convertQTTimeToSecond(QTTime t)
     effects = [coder decodeObjectForKey:@"effects"];
     pxKeyframe = [coder decodeObjectForKey:@"pxKeyframe"];
     pyKeyframe = [coder decodeObjectForKey:@"pyKeyframe"];
     effects = [coder decodeObjectForKey:@"effects"];
     pxKeyframe = [coder decodeObjectForKey:@"pxKeyframe"];
     pyKeyframe = [coder decodeObjectForKey:@"pyKeyframe"];

+    [media setSpeed:[coder decodeFloatForKey:@"speed"]];

     
     [self setLayer:alayer];
 }
     
     [self setLayer:alayer];
 }


@@ -397,4 +440,30 @@ static float convertQTTimeToSecond(QTTime t)
     return [media type];
 }
 
     return [media type];
 }
 

+- (NSString*)printName
+{
+    if([[media type] isEqualToString:@"text"])
+        return @"text";
+    
+    return [self getPath];
+}
+
+- (NSSize)originSize
+{
+    return originSize.size;
+}
+
+- (float)speed
+{
+    return [media speed];
+}
+
+- (void)setSpeed:(float)s
+{
+    if(s < 0.01 || s > 100.0) return;
+    [media setSpeed:s];
+    mapping.duration = [media duration];
+    [self setLayer:alayer];
+}
+

 @end
 @end

diff --git a/ElisMainView.h b/ElisMainView.h
index 1be81dd..5e31f3e 100644 (file)
--- a/ElisMainView.h
+++ b/ElisMainView.h
@@ -47,6 +47,7 @@ BOOL rendering;
     QTTime timeOffset;
     CVTimeStamp* stamp;
     QTTime _qt;
     QTTime timeOffset;
     CVTimeStamp* stamp;
     QTTime _qt;

+    float scale;

     
     NSMutableArray* layerSet;
     ElisLayer** sortedLayerSet;
     
     NSMutableArray* layerSet;
     ElisLayer** sortedLayerSet;

diff --git a/ElisMainView.m b/ElisMainView.m
index a996671..ab967ff 100644 (file)
--- a/ElisMainView.m
+++ b/ElisMainView.m
@@ -76,7 +76,7 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink,
         CVDisplayLinkSetOutputCallback(displayLink, &MyRenderCallback, self);
     }
     
         CVDisplayLinkSetOutputCallback(displayLink, &MyRenderCallback, self);
     }
     

-//    [self setBounds:NSMakeRect(0, 0, 640, 480)];
+    scale = 1.0;

 //    [self setFrame:NSMakeRect(0, 0, 640/2, 480/2)];
     
     NSLog(@"Elis Colors, Stand by ready.");
 //    [self setFrame:NSMakeRect(0, 0, 640/2, 480/2)];
     
     NSLog(@"Elis Colors, Stand by ready.");


@@ -129,18 +129,13 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink,
     NSPoint point;
     CGRect imageRect;
     CGPoint cp;
     NSPoint point;
     CGRect imageRect;
     CGPoint cp;

+    NSRect frame = [self frame];
+    NSSize originSize;
+    float dx, dy;

     
     

-    // 境界線を引く
-    if(printBorderLine){
-    glBegin(GL_LINE_LOOP);
-    glColor3d(0.7, 0.7, 0.7);
-    glVertex2i(-1, -1);
-    glVertex2i(ProjectMovieSize.size.width+1, -1);
-    glVertex2i(ProjectMovieSize.size.width+1, ProjectMovieSize.size.height+1);
-    glVertex2i(-1, ProjectMovieSize.size.height+1);
-    glEnd();
-    }
-    
+    dx = (frame.size.width - ProjectMovieSize.size.width)/2;
+    dy = (frame.size.height - ProjectMovieSize.size.height)/2;
+

     // トラック番号順にバケットソート
     memset(sortedLayerSet, 0, sizeof(void*) * TRACK_SIZE);
     for(i = 0; i < size; i++)
     // トラック番号順にバケットソート
     memset(sortedLayerSet, 0, sizeof(void*) * TRACK_SIZE);
     for(i = 0; i < size; i++)


@@ -151,6 +146,7 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink,
         
         ci = [sortedLayerSet[i] getEffectedImageWithoutStamp:time]; // 違いはここ。
         point = [sortedLayerSet[i] getPositionForTime:[sortedLayerSet[i] convertToInnnerTime:time]];
         
         ci = [sortedLayerSet[i] getEffectedImageWithoutStamp:time]; // 違いはここ。
         point = [sortedLayerSet[i] getPositionForTime:[sortedLayerSet[i] convertToInnnerTime:time]];

+        originSize = [sortedLayerSet[i] originSize];

         if(ci == nil) continue; // サウンドレイヤーはスキップ
         imageRect = [ci extent];
         if(imageRect.size.width >= 4000){
         if(ci == nil) continue; // サウンドレイヤーはスキップ
         imageRect = [ci extent];
         if(imageRect.size.width >= 4000){


@@ -158,11 +154,28 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink,
         }
         
         cp = *(CGPoint*)&point;
         }
         
         cp = *(CGPoint*)&point;

+        if(rendering == NO){
+            cp.x += dx;
+            cp.y += dy;
+        }
+        cp.x -= (imageRect.size.width - originSize.width)/2;
+        cp.y -= (imageRect.size.height - originSize.height)/2;

 //        [ciContext drawImage:ci inRect:CGRectMake(point.x, point.y, imageRect.size.width, imageRect.size.height) fromRect:imageRect];
         [ciContext drawImage:ci atPoint:cp fromRect:imageRect];        
 //        [ciContext drawImage:ci inRect:CGRectMake(point.x, point.y, 640, 480) fromRect:CGRectMake(0, 0, 640, 480)];
     }
     
 //        [ciContext drawImage:ci inRect:CGRectMake(point.x, point.y, imageRect.size.width, imageRect.size.height) fromRect:imageRect];
         [ciContext drawImage:ci atPoint:cp fromRect:imageRect];        
 //        [ciContext drawImage:ci inRect:CGRectMake(point.x, point.y, 640, 480) fromRect:CGRectMake(0, 0, 640, 480)];
     }
     

+    // 境界線を引く
+    if(printBorderLine && rendering == NO){
+        glBegin(GL_LINE_LOOP);
+        glColor3d(0.7, 0.7, 0.7);
+        glVertex2i(dx+1, dy+1);
+        glVertex2i(ProjectMovieSize.size.width+1+dx, dy+1);
+        glVertex2i(ProjectMovieSize.size.width+1+dx, ProjectMovieSize.size.height+1+dy);
+        glVertex2i(dx+1, ProjectMovieSize.size.height+1+dy);
+        glEnd();
+    }
+    

     glFlush();
     
     // あとかたづけ
     glFlush();
     
     // あとかたづけ


@@ -186,17 +199,12 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink,
     NSPoint point;
     CGRect imageRect;
     CGPoint cp;
     NSPoint point;
     CGRect imageRect;
     CGPoint cp;

+    NSRect frame = [self frame];
+    NSSize originSize;
+    float dx, dy;

     
     

-    // 境界線を引く
-    if(printBorderLine){
-    glBegin(GL_LINE_LOOP);
-    glColor3d(0.7, 0.7, 0.7);
-    glVertex2i(-1, -1);
-    glVertex2i(ProjectMovieSize.size.width+1, -1);
-    glVertex2i(ProjectMovieSize.size.width+1, ProjectMovieSize.size.height+1);
-    glVertex2i(-1, ProjectMovieSize.size.height+1);
-    glEnd();
-    }
+    dx = (frame.size.width - ProjectMovieSize.size.width)/2;
+    dy = (frame.size.height - ProjectMovieSize.size.height)/2;

     
     // トラック番号順にバケットソート
     memset(sortedLayerSet, 0, sizeof(void*) * TRACK_SIZE);
     
     // トラック番号順にバケットソート
     memset(sortedLayerSet, 0, sizeof(void*) * TRACK_SIZE);


@@ -208,6 +216,7 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink,
         
         ci = [sortedLayerSet[i] getEffectedImage:stamp forTime:_qt];
         point = [sortedLayerSet[i] getPositionForTime:[sortedLayerSet[i] convertToInnnerTime:_qt]];
         
         ci = [sortedLayerSet[i] getEffectedImage:stamp forTime:_qt];
         point = [sortedLayerSet[i] getPositionForTime:[sortedLayerSet[i] convertToInnnerTime:_qt]];

+        originSize = [sortedLayerSet[i] originSize];

         if(ci == nil) continue; // サウンドレイヤーはスキップ
         
         imageRect = [ci extent];
         if(ci == nil) continue; // サウンドレイヤーはスキップ
         
         imageRect = [ci extent];


@@ -216,12 +225,25 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink,
         }
 
         cp = *(CGPoint*)&point;
         }
 
         cp = *(CGPoint*)&point;

+        cp.x += dx - (imageRect.size.width - originSize.width)/2;
+        cp.y += dy - (imageRect.size.height - originSize.height)/2;

 //        [ciContext drawImage:ci inRect:imageRect fromRect:CGRectMake(point.x, point.y, ProjectMovieSize.size.width, ProjectMovieSize.size.height)];
         [ciContext drawImage:ci atPoint:cp fromRect:imageRect];
 //        [ciContext drawImage:ci inRect:CGRectMake(point.x, point.y, imageRect.size.width, imageRect.size.height)
 //                    fromRect:imageRect];
     }
     
 //        [ciContext drawImage:ci inRect:imageRect fromRect:CGRectMake(point.x, point.y, ProjectMovieSize.size.width, ProjectMovieSize.size.height)];
         [ciContext drawImage:ci atPoint:cp fromRect:imageRect];
 //        [ciContext drawImage:ci inRect:CGRectMake(point.x, point.y, imageRect.size.width, imageRect.size.height)
 //                    fromRect:imageRect];
     }
     

+    // 境界線を引く
+    if(printBorderLine){
+        glBegin(GL_LINE_LOOP);
+        glColor3d(0.7, 0.7, 0.7);
+        glVertex2i(dx+1, dy+1);
+        glVertex2i(ProjectMovieSize.size.width+1+dx, dy+1);
+        glVertex2i(ProjectMovieSize.size.width+1+dx, ProjectMovieSize.size.height+1+dy);
+        glVertex2i(dx+1, ProjectMovieSize.size.height+1+dy);
+        glEnd();
+    }
+    

     glFlush();
     
     // あとかたづけ
     glFlush();
     
     // あとかたづけ


@@ -293,14 +315,14 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink,
 }
 
 - (void)getCurrentPixelData:(NSRect)rect buffer:(void*)buffer
 }
 
 - (void)getCurrentPixelData:(NSRect)rect buffer:(void*)buffer

-{
+{    

     glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
     glPixelStorei(GL_PACK_ALIGNMENT, 4);       
     glPixelStorei(GL_PACK_ROW_LENGTH, 0);
     glPixelStorei(GL_PACK_SKIP_ROWS, 0);
     glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
     
     glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
     glPixelStorei(GL_PACK_ALIGNMENT, 4);       
     glPixelStorei(GL_PACK_ROW_LENGTH, 0);
     glPixelStorei(GL_PACK_SKIP_ROWS, 0);
     glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
     

-//    glReadBuffer(GL_FRONT); // フロントバッファ（って何だろう？）からピクセルを読みに行く。
+    // これが公式の方法とかマジないわー。

     glReadPixels(0, 0, rect.size.width, rect.size.height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, buffer);
     
     glPopClientAttrib();
     glReadPixels(0, 0, rect.size.width, rect.size.height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, buffer);
     
     glPopClientAttrib();

diff --git a/ElisMedia.h b/ElisMedia.h
index 35256f3..1af7f78 100644 (file)
--- a/ElisMedia.h
+++ b/ElisMedia.h
@@ -50,5 +50,8 @@
 - (void)releaseContext;
 - (NSString*)type;
 - (NSAttributedString*)text;
 - (void)releaseContext;
 - (NSString*)type;
 - (NSAttributedString*)text;

+- (NSRect)size;
+- (float)speed;
+- (void)setSpeed:(float)s;

 
 @end
 
 @end

diff --git a/ElisMedia.m b/ElisMedia.m
index cddfa17..84be399 100644 (file)
--- a/ElisMedia.m
+++ b/ElisMedia.m
@@ -107,7 +107,7 @@
     [im lockFocus];
 //    t = [[NSAttributedString alloc] initWithString:@"string"];
     [[NSGraphicsContext currentContext] setShouldAntialias:YES];
     [im lockFocus];
 //    t = [[NSAttributedString alloc] initWithString:@"string"];
     [[NSGraphicsContext currentContext] setShouldAntialias:YES];

-    [t drawInRect:NSMakeRect(0, 0, 640, 480)];
+    [t drawInRect:NSMakeRect(0, 0, [im size].width, [im size].height)];

     [im unlockFocus];
     image = [[CIImage alloc] initWithData:[im TIFFRepresentation]];
 //    [im release];
     [im unlockFocus];
     image = [[CIImage alloc] initWithData:[im TIFFRepresentation]];
 //    [im release];


@@ -157,7 +157,7 @@
 
 - (void)setCurrentTime:(QTTime)time
 {
 
 - (void)setCurrentTime:(QTTime)time
 {

-    //    time.timeValue *= speed;
+    time.timeValue *= speed;

     if(movie){
         [movie setAttribute:[NSValue valueWithQTTime:time] forKey:QTMovieCurrentTimeAttribute];
         MoviesTask([movie quickTimeMovie], 0);
     if(movie){
         [movie setAttribute:[NSValue valueWithQTTime:time] forKey:QTMovieCurrentTimeAttribute];
         MoviesTask([movie quickTimeMovie], 0);


@@ -169,7 +169,8 @@
 - (void)play
 {
     if(movie && !playing && usingStampMode){
 - (void)play
 {
     if(movie && !playing && usingStampMode){

-        [movie play];
+//        [movie play];
+        [movie setRate:speed];

         playing = YES;
     }
     if(sound && YES){
         playing = YES;
     }
     if(sound && YES){


@@ -192,8 +193,13 @@
 
 - (QTTime)duration
 {
 
 - (QTTime)duration
 {

-    if(movie)
-        return [movie duration];
+    if(movie){
+        QTTime d = [movie duration];
+        d.timeValue /= speed;
+        float s = (float)d.timeValue/d.timeScale;
+        if(s > 60*10) return QTMakeTime(60*10, 1);
+        return d;
+    }

     if(sound)
         return [sound duration];
     if(image)
     if(sound)
         return [sound duration];
     if(image)


@@ -253,6 +259,7 @@
     int flag;
     [encoder encodeObject:_path forKey:@"path"];
     [encoder encodeObject:text forKey:@"text"];
     int flag;
     [encoder encodeObject:_path forKey:@"path"];
     [encoder encodeObject:text forKey:@"text"];

+    [encoder encodeFloat:speed forKey:@"speed"];

     
     if(movie) flag = 0;
     else if(sound) flag = 1;
     
     if(movie) flag = 0;
     else if(sound) flag = 1;


@@ -269,16 +276,20 @@
     NSAttributedString* t = [coder decodeObjectForKey:@"text"];
     flag =  [coder decodeIntForKey:@"flag"];
     
     NSAttributedString* t = [coder decodeObjectForKey:@"text"];
     flag =  [coder decodeIntForKey:@"flag"];
     

+    id ret;
+    

     if(flag == 0)
     if(flag == 0)

-        return [self initWithMovieFile:path];
+        ret = [self initWithMovieFile:path];

     else if(flag == 1)
     else if(flag == 1)

-        return [self initWithSoundFile:path];
+        ret = [self initWithSoundFile:path];

     else if(flag == 2)
     else if(flag == 2)

-        return [self initWithImageFile:path];
-    else {
-        return [self initWithText:t];
-    }
+        ret = [self initWithImageFile:path];
+    else
+        ret = [self initWithText:t];
+    
+    speed = [coder decodeFloatForKey:@"speed"];

     
     

+    return ret;

 }
 
 - (QTMovie*)getSoundMovie
 }
 
 - (QTMovie*)getSoundMovie


@@ -299,4 +310,29 @@
     [self initWithText:t];
 }
 
     [self initWithText:t];
 }
 

+- (NSRect)size
+{
+    if(sound)
+        return NSZeroRect;
+    if(movie){
+        NSSize s;
+        s = [[movie attributeForKey:QTMovieCurrentSizeAttribute] sizeValue];
+        return NSMakeRect(0, 0, s.width, s.height);
+    }
+    if(image){
+        CGRect c = [image extent];
+        return *(NSRect*)&c;
+    }
+}
+
+- (float)speed
+{
+    return speed;
+}
+
+- (void)setSpeed:(float)s
+{
+    speed = s;
+}
+

 @end
 @end

diff --git a/ElisMovieSizeWindowController.h b/ElisMovieSizeWindowController.h
index 3f7bd4b..5168e42 100644 (file)
--- a/ElisMovieSizeWindowController.h
+++ b/ElisMovieSizeWindowController.h
@@ -1,3 +1,24 @@
+//  Copyright (c) 2009 Yanagi Asakura
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//  claim that you wrote the original software. If you use this software
+//  in a product, an acknowledgment in the product documentation would be
+//  appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//  misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source
+//  distribution.
+

 //
 //  ElisMovieSizeWindowController.h
 //  Elis Colors
 //
 //  ElisMovieSizeWindowController.h
 //  Elis Colors

diff --git a/ElisMovieSizeWindowController.m b/ElisMovieSizeWindowController.m
index ebe8251..6169d35 100644 (file)
--- a/ElisMovieSizeWindowController.m
+++ b/ElisMovieSizeWindowController.m
@@ -1,3 +1,24 @@
+//  Copyright (c) 2009 Yanagi Asakura
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//  claim that you wrote the original software. If you use this software
+//  in a product, an acknowledgment in the product documentation would be
+//  appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//  misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source
+//  distribution.
+

 //
 //  ElisMovieSizeWindowController.m
 //  Elis Colors
 //
 //  ElisMovieSizeWindowController.m
 //  Elis Colors

diff --git a/ElisMovieSpeedController.h b/ElisMovieSpeedController.h
new file mode 100644 (file)
index 0000000..effdb88
--- /dev/null
+++ b/ElisMovieSpeedController.h
@@ -0,0 +1,63 @@
+//  Copyright (c) 2009 Yanagi Asakura
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//  claim that you wrote the original software. If you use this software
+//  in a product, an acknowledgment in the product documentation would be
+//  appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//  misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source
+//  distribution.//  Copyright (c) 2009 Yanagi Asakura
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//  claim that you wrote the original software. If you use this software
+//  in a product, an acknowledgment in the product documentation would be
+//  appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//  misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source
+//  distribution.
+
+//
+//  ElisMovieSpeedController.h
+//  Elis Colors
+//
+//  Created by 柳 on 09/09/29.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "ElisLayer.h"
+
+@interface ElisMovieSpeedController : NSObject {
+    IBOutlet NSTextField* _speedField;
+    IBOutlet NSWindow* _sheet;
+    id _mainWindow;
+    ElisLayer* layer;
+}
+
+- (void)setMainWindow:(id)w;
+- (IBAction)pushedOK:(id)sender;
+- (IBAction)pushedCancel:(id)sender;
+
+@end

diff --git a/ElisMovieSpeedController.m b/ElisMovieSpeedController.m
new file mode 100644 (file)
index 0000000..667783e
--- /dev/null
+++ b/ElisMovieSpeedController.m
@@ -0,0 +1,75 @@
+//  Copyright (c) 2009 Yanagi Asakura
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//  claim that you wrote the original software. If you use this software
+//  in a product, an acknowledgment in the product documentation would be
+//  appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//  misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source
+//  distribution.
+
+//
+//  ElisMovieSpeedController.m
+//  Elis Colors
+//
+//  Created by 柳 on 09/09/29.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import "ElisMovieSpeedController.h"
+
+
+@implementation ElisMovieSpeedController
+
+- (id)init
+{
+    [NSBundle loadNibNamed:@"speed" owner:self];
+    return self;
+}
+
+- (void)setMainWindow:(id)w
+{
+    _mainWindow = w;
+}
+
+- (void)setLayer:(ElisLayer*)l
+{
+    layer = l;
+}
+
+- (void)run
+{
+    float s = [layer speed];
+    [_speedField setFloatValue:s*100];
+    
+    [NSApp beginSheet:_sheet modalForWindow:_mainWindow
+        modalDelegate:self didEndSelector:nil contextInfo:nil];
+}
+
+- (IBAction)pushedOK:(id)sender
+{
+    float s = [_speedField floatValue];
+    [layer setSpeed:s/100.0];
+    
+    [_sheet close];
+    [NSApp endSheet:_sheet];
+}
+
+- (IBAction)pushedCancel:(id)sender
+{
+    [_sheet close];
+    [NSApp endSheet:_sheet];
+}
+
+@end

diff --git a/ElisPreferenceController.h b/ElisPreferenceController.h
index 094efbb..3a61773 100644 (file)
--- a/ElisPreferenceController.h
+++ b/ElisPreferenceController.h
@@ -1,3 +1,24 @@
+//  Copyright (c) 2009 Yanagi Asakura
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//  claim that you wrote the original software. If you use this software
+//  in a product, an acknowledgment in the product documentation would be
+//  appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//  misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source
+//  distribution.
+

 //
 //  ElisPreferenceController.h
 //  Elis Colors
 //
 //  ElisPreferenceController.h
 //  Elis Colors

diff --git a/ElisPreferenceController.m b/ElisPreferenceController.m
index 00e6cbf..8a330a2 100644 (file)
--- a/ElisPreferenceController.m
+++ b/ElisPreferenceController.m
@@ -1,3 +1,24 @@
+//  Copyright (c) 2009 Yanagi Asakura
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//  claim that you wrote the original software. If you use this software
+//  in a product, an acknowledgment in the product documentation would be
+//  appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//  misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source
+//  distribution.
+

 //
 //  ElisPreferenceController.m
 //  Elis Colors
 //
 //  ElisPreferenceController.m
 //  Elis Colors

diff --git a/ElisPropertyTableController.m b/ElisPropertyTableController.m
index 86c889b..4053f64 100644 (file)
--- a/ElisPropertyTableController.m
+++ b/ElisPropertyTableController.m
@@ -223,4 +223,31 @@
 
 }
 
 
 }
 

+- (void)controlTextDidEndEditing:(NSNotification*)n
+{
+    int rowIndex = [_propertyView selectedRow];
+    float x, y;
+    NSString* name = [propertyNames objectAtIndex:rowIndex];
+    QTTime localCurrentTime;
+    float value = [[n object] floatValue];
+    
+    if(recording)
+        localCurrentTime = [interestLayer convertToInnnerTime:globalCurrentTime];
+    else 
+        localCurrentTime = QTZeroTime;
+    
+    if([name isEqualToString:@"Position X"]){
+//        x = [sender floatValue] * 2.0 * ProjectMovieSize.size.width - ProjectMovieSize.size.width;
+        [[effects objectAtIndex:rowIndex] setPositionX:value forTime:localCurrentTime];
+    } else if([name isEqualToString:@"Position Y"]){
+//        y = [sender floatValue] * 2.0 * ProjectMovieSize.size.height - ProjectMovieSize.size.height;
+        [[effects objectAtIndex:rowIndex] setPositionY:value forTime:localCurrentTime];
+    } else {
+        [[effects objectAtIndex:rowIndex] setEffectTrueValueForTime:[valueNames objectAtIndex:rowIndex] 
+                                                              value:value time:localCurrentTime];
+    }
+    [self reload];
+    [_mainController refresh];
+}
+

 @end
 @end

diff --git a/ElisUndoManager.h b/ElisUndoManager.h
index a18531b..b389e7b 100644 (file)
--- a/ElisUndoManager.h
+++ b/ElisUndoManager.h
@@ -1,3 +1,24 @@
+//  Copyright (c) 2009 Yanagi Asakura
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//  claim that you wrote the original software. If you use this software
+//  in a product, an acknowledgment in the product documentation would be
+//  appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//  misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source
+//  distribution.
+

 //
 //  ElisUndoManager.h
 //  Elis Colors
 //
 //  ElisUndoManager.h
 //  Elis Colors

diff --git a/ElisUndoManager.m b/ElisUndoManager.m
index b28a9c0..a2b7986 100644 (file)
--- a/ElisUndoManager.m
+++ b/ElisUndoManager.m
@@ -1,3 +1,24 @@
+//  Copyright (c) 2009 Yanagi Asakura
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//  claim that you wrote the original software. If you use this software
+//  in a product, an acknowledgment in the product documentation would be
+//  appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//  misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source
+//  distribution.
+

 //
 //  ElisUndoManager.m
 //  Elis Colors
 //
 //  ElisUndoManager.m
 //  Elis Colors

diff --git a/ElisWriterLegacy.m b/ElisWriterLegacy.m
index 4aa79f9..105d7f0 100644 (file)
--- a/ElisWriterLegacy.m
+++ b/ElisWriterLegacy.m
@@ -183,16 +183,6 @@ static OSErr QTMoovProcs_VideoTrackDataProc(void *theRefcon, MovieExportGetDataP
             
             return;
         }
             
             return;
         }

-    } else {
-        // いらない
-        // Setup the Movie Export component with our preset export settings
-//        QTAtomContainer settings;
-//        
-//        PtrToHand(ExportSettings, (Handle *)&settings, sizeof(ExportSettings));
-//        
-//        MovieExportSetSettingsFromAtomContainer(myExporter, settings);
-//        
-//        QTDisposeAtomContainer(settings);

     }
     
     isExporting = YES;
     }
     
     isExporting = YES;


@@ -262,69 +252,9 @@ static OSErr QTMoovProcs_VideoTrackDataProc(void *theRefcon, MovieExportGetDataP
     
     CloseComponent(myExporter);
     
     
     CloseComponent(myExporter);
     

-    // do some extra work if we're exporting to iPod
-    // いらない。
-//    if (!cancelExport && YES == exportToPod) {
-//        Handle podExportDataRef;
-//        OSType podExportDataRefType;
-//        Movie theRecentlyExportedMovie;
-//        short resID = movieInDataForkResID;
-//        
-//        // open the movie we just exported
-//        NewMovieFromDataRef(&theRecentlyExportedMovie, newMovieActive, &resID, myDataRef, myDataType);
-//        
-//        // create a new data reference using the .m4v extention
-//        CFMutableStringRef newFileName = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, (CFStringRef)[savePanel filename]);
-//        CFRange extension = CFStringFind(newFileName, CFSTR(".mov"), kCFCompareBackwards);
-//        CFStringReplace(newFileName, extension, CFSTR(".m4v"));
-//        
-//        QTNewDataReferenceFromFullPathCFString(newFileName, kQTNativeDefaultPathStyle, 0, &podExportDataRef, &podExportDataRefType);
-//        
-//        // Delete any existing .m4v file with the same name
-//        [[NSFileManager defaultManager] removeFileAtPath:(NSString *)newFileName handler:nil];
-//        
-//        // find and open the iPod export component, if you wanted to export to ATV use the 'M4VH' fourCC
-//        err = OpenADefaultComponent(MovieExportType, 'M4V ', &myExporter);
-//        if (err == noErr && 0 != myExporter) {
-//            
-//            // set the progress procedure for some basic UI
-//            MovieExportSetProgressProc(myExporter, NewMovieProgressUPP(QTMoovProcs_PodExportProgress), (long)delegate);
-//            
-//            // do the export
-//            MovieExportToDataRef(myExporter, podExportDataRef, podExportDataRefType, theRecentlyExportedMovie, 0, 0, GetMovieDuration(theRecentlyExportedMovie));
-//            
-//            // clean up
-//            CloseComponent(myExporter);
-//            DisposeHandle(podExportDataRef);
-//            DisposeMovie(theRecentlyExportedMovie);
-//            
-//            // delete the original .mov file which we don't need anymore
-//            [[NSFileManager defaultManager] removeFileAtPath:[savePanel filename] handler:nil];
-//            
-//            // open the .m4v in QuickTime Player -- just using openFile would result in iTunes starting up (not what I want to happen)
-//            [[NSWorkspace sharedWorkspace] openFile:(NSString *)newFileName withApplication:@"QuickTime Player"];
-//        }
-//        
-//    } else if (!cancelExport) {
-//        
-//        // open the movie in the QuickTime Player
-//        // これもいらないね。
-//        [[NSWorkspace sharedWorkspace] openFile:[savePanel filename]];
-//    }
-    

     // dispose the original data reference
     DisposeHandle(myDataRef);
     
     // dispose the original data reference
     DisposeHandle(myDataRef);
     

-    // got back to the beginning of the movie
-//    QTTime currentTime = { 0, movieDuration.timeScale, 0 };
-//    
-//    [qtMovie setCurrentTime: currentTime];
-//    MoviesTask([qtMovie quickTimeMovie], 0); // QTKit is not doing this automatically
-//    
-//    // render the frame
-//    [self updateCurrentFrame];                       
-//    [self display];
-    

     [_barSheet close];
     [NSApp endSheet:_barSheet];
     
     [_barSheet close];
     [NSApp endSheet:_barSheet];
     


@@ -373,7 +303,7 @@ static OSErr QTMoovProcs_VideoTrackDataProc(void *theRefcon, MovieExportGetDataP
      therefore we resort to flipping the image by hand.
      */
     int i = outputHeight;
      therefore we resort to flipping the image by hand.
      */
     int i = outputHeight;

-    while(--i > 0) {
+    while(--i >= 0) {

         memcpy(flippedContextPixels + ((outputHeight - i - 1) * contextRowBytes), contextPixels + (i * contextRowBytes), contextRowBytes);
     }
     
         memcpy(flippedContextPixels + ((outputHeight - i - 1) * contextRowBytes), contextPixels + (i * contextRowBytes), contextRowBytes);
     }
     

diff --git a/Elis_Colors-Info.plist b/Elis_Colors-Info.plist
index 5b3b5b8..a7bec17 100644 (file)
--- a/Elis_Colors-Info.plist
+++ b/Elis_Colors-Info.plist
@@ -23,10 +23,12 @@
        <key>LSMinimumSystemVersion</key>
        <string>${MACOSX_DEPLOYMENT_TARGET}</string>
        <key>CFBundleVersion</key>
        <key>LSMinimumSystemVersion</key>
        <string>${MACOSX_DEPLOYMENT_TARGET}</string>
        <key>CFBundleVersion</key>

-       <string>1</string>
+       <string>alpha1</string>

        <key>NSMainNibFile</key>
        <string>MainMenu</string>
        <key>NSPrincipalClass</key>
        <string>NSApplication</string>
        <key>NSMainNibFile</key>
        <string>MainMenu</string>
        <key>NSPrincipalClass</key>
        <string>NSApplication</string>

+       <key>NSHumanReadableCopyright</key>
+       <string>© 2009, Yanagi Asakura</string>

 </dict>
 </plist>
 </dict>
 </plist>

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 5c59219..eee265c 100644 (file)
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
        <data>
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
        <data>

-               <int key="IBDocument.SystemTarget">1060</int>
+               <int key="IBDocument.SystemTarget">1050</int>

                <string key="IBDocument.SystemVersion">10B504</string>
                <string key="IBDocument.InterfaceBuilderVersion">732</string>
                <string key="IBDocument.AppKitVersion">1038.2</string>
                <string key="IBDocument.SystemVersion">10B504</string>
                <string key="IBDocument.InterfaceBuilderVersion">732</string>
                <string key="IBDocument.AppKitVersion">1038.2</string>


@@ -21,8 +21,8 @@
                </object>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                </object>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>

-                       <integer value="679"/>
-                       <integer value="57"/>
+                       <integer value="205"/>
+                       <integer value="590"/>

                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>


@@ -100,14 +100,6 @@
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>

-                                                               <object class="NSMenuItem" id="387527700">
-                                                                       <reference key="NSMenu" ref="110575045"/>
-                                                                       <string key="NSTitle">Change Small Window</string>
-                                                                       <string key="NSKeyEquiv"/>
-                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                               </object>

                                                                <object class="NSMenuItem" id="481834944">
                                                                        <reference key="NSMenu" ref="110575045"/>
                                                                        <bool key="NSIsDisabled">YES</bool>
                                                                <object class="NSMenuItem" id="481834944">
                                                                        <reference key="NSMenu" ref="110575045"/>
                                                                        <bool key="NSIsDisabled">YES</bool>


@@ -320,6 +312,24 @@
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>

+                                                               <object class="NSMenuItem" id="633557527">
+                                                                       <reference key="NSMenu" ref="720053764"/>
+                                                                       <string key="NSTitle">Change Movie Size</string>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="35465992"/>
+                                                                       <reference key="NSMixedImage" ref="502551668"/>
+                                                               </object>
+                                                               <object class="NSMenuItem" id="42541374">
+                                                                       <reference key="NSMenu" ref="720053764"/>
+                                                                       <bool key="NSIsDisabled">YES</bool>
+                                                                       <bool key="NSIsSeparator">YES</bool>
+                                                                       <string key="NSTitle"/>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="35465992"/>
+                                                                       <reference key="NSMixedImage" ref="502551668"/>
+                                                               </object>

                                                                <object class="NSMenuItem" id="294629803">
                                                                        <reference key="NSMenu" ref="720053764"/>
                                                                        <string key="NSTitle">Page Setup...</string>
                                                                <object class="NSMenuItem" id="294629803">
                                                                        <reference key="NSMenu" ref="720053764"/>
                                                                        <string key="NSTitle">Page Setup...</string>


@@ -420,6 +430,25 @@
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>

+                                                               <object class="NSMenuItem" id="583158037">
+                                                                       <reference key="NSMenu" ref="789758025"/>
+                                                                       <string key="NSTitle">Select All</string>
+                                                                       <string key="NSKeyEquiv">a</string>
+                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="35465992"/>
+                                                                       <reference key="NSMixedImage" ref="502551668"/>
+                                                               </object>
+                                                               <object class="NSMenuItem" id="785837009">
+                                                                       <reference key="NSMenu" ref="789758025"/>
+                                                                       <bool key="NSIsDisabled">YES</bool>
+                                                                       <bool key="NSIsSeparator">YES</bool>
+                                                                       <string key="NSTitle"/>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="35465992"/>
+                                                                       <reference key="NSMixedImage" ref="502551668"/>
+                                                               </object>

                                                                <object class="NSMenuItem" id="437104165">
                                                                        <reference key="NSMenu" ref="789758025"/>
                                                                        <string key="NSTitle">Delete Layer</string>
                                                                <object class="NSMenuItem" id="437104165">
                                                                        <reference key="NSMenu" ref="789758025"/>
                                                                        <string key="NSTitle">Delete Layer</string>


@@ -437,40 +466,47 @@
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>

-                                                               <object class="NSMenuItem" id="583158037">
+                                                               <object class="NSMenuItem" id="206868603">

                                                                        <reference key="NSMenu" ref="789758025"/>
                                                                        <reference key="NSMenu" ref="789758025"/>

-                                                                       <string key="NSTitle">Select All</string>
-                                                                       <string key="NSKeyEquiv">a</string>
-                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                       <string key="NSTitle">Change Speed</string>
+                                                                       <string key="NSKeyEquiv"/>

                                                                        <int key="NSMnemonicLoc">2147483647</int>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>
                                                                        <int key="NSMnemonicLoc">2147483647</int>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>

-                                                               <object class="NSMenuItem" id="212016141">
+                                                               <object class="NSMenuItem" id="272683826">

                                                                        <reference key="NSMenu" ref="789758025"/>
                                                                        <bool key="NSIsDisabled">YES</bool>
                                                                        <bool key="NSIsSeparator">YES</bool>
                                                                        <string key="NSTitle"/>
                                                                        <string key="NSKeyEquiv"/>
                                                                        <reference key="NSMenu" ref="789758025"/>
                                                                        <bool key="NSIsDisabled">YES</bool>
                                                                        <bool key="NSIsSeparator">YES</bool>
                                                                        <string key="NSTitle"/>
                                                                        <string key="NSKeyEquiv"/>

-                                                                       <int key="NSKeyEquivModMask">1048576</int>

                                                                        <int key="NSMnemonicLoc">2147483647</int>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>
                                                                        <int key="NSMnemonicLoc">2147483647</int>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>

-                                                               <object class="NSMenuItem" id="999140926">
+                                                               <object class="NSMenuItem" id="210896482">

                                                                        <reference key="NSMenu" ref="789758025"/>
                                                                        <reference key="NSMenu" ref="789758025"/>

-                                                                       <string key="NSTitle">Change Movie Size</string>
+                                                                       <string key="NSTitle">Goto Later Layer</string>

                                                                        <string key="NSKeyEquiv"/>
                                                                        <int key="NSMnemonicLoc">2147483647</int>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>
                                                                        <string key="NSKeyEquiv"/>
                                                                        <int key="NSMnemonicLoc">2147483647</int>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>

-                                                               <object class="NSMenuItem" id="785837009">
+                                                               <object class="NSMenuItem" id="788379769">
+                                                                       <reference key="NSMenu" ref="789758025"/>
+                                                                       <string key="NSTitle">Goto Previous Layer</string>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="35465992"/>
+                                                                       <reference key="NSMixedImage" ref="502551668"/>
+                                                               </object>
+                                                               <object class="NSMenuItem" id="212016141">

                                                                        <reference key="NSMenu" ref="789758025"/>
                                                                        <bool key="NSIsDisabled">YES</bool>
                                                                        <bool key="NSIsSeparator">YES</bool>
                                                                        <string key="NSTitle"/>
                                                                        <string key="NSKeyEquiv"/>
                                                                        <reference key="NSMenu" ref="789758025"/>
                                                                        <bool key="NSIsDisabled">YES</bool>
                                                                        <bool key="NSIsSeparator">YES</bool>
                                                                        <string key="NSTitle"/>
                                                                        <string key="NSKeyEquiv"/>

+                                                                       <int key="NSKeyEquivModMask">1048576</int>

                                                                        <int key="NSMnemonicLoc">2147483647</int>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                        <int key="NSMnemonicLoc">2147483647</int>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>


@@ -1370,7 +1406,7 @@
                        <object class="NSWindowTemplate" id="972006081">
                                <int key="NSWindowStyleMask">271</int>
                                <int key="NSWindowBacking">2</int>
                        <object class="NSWindowTemplate" id="972006081">
                                <int key="NSWindowStyleMask">271</int>
                                <int key="NSWindowBacking">2</int>

-                               <string key="NSWindowRect">{{80, 219}, {1262, 911}}</string>
+                               <string key="NSWindowRect">{{80, 203}, {1281, 927}}</string>

                                <int key="NSWTFlags">1954021376</int>
                                <string key="NSWindowTitle">Elis Colors</string>
                                <string key="NSWindowClass">NSWindow</string>
                                <int key="NSWTFlags">1954021376</int>
                                <string key="NSWindowTitle">Elis Colors</string>
                                <string key="NSWindowClass">NSWindow</string>


@@ -1385,11 +1421,11 @@
                                                <object class="NSButton" id="688822305">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">303</int>
                                                <object class="NSButton" id="688822305">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">303</int>

-                                                       <string key="NSFrame">{{853, 376}, {118, 25}}</string>
+                                                       <string key="NSFrame">{{932, 376}, {109, 25}}</string>

                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSButtonCell" key="NSCell" id="482717347">
                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSButtonCell" key="NSCell" id="482717347">

-                                                               <int key="NSCellFlags">-2080244224</int>
+                                                               <int key="NSCellFlags">67239424</int>

                                                                <int key="NSCellFlags2">134217728</int>
                                                                <string key="NSContents">Play</string>
                                                                <object class="NSFont" key="NSSupport" id="1004466011">
                                                                <int key="NSCellFlags2">134217728</int>
                                                                <string key="NSContents">Play</string>
                                                                <object class="NSFont" key="NSSupport" id="1004466011">


@@ -1398,7 +1434,7 @@
                                                                        <int key="NSfFlags">1044</int>
                                                                </object>
                                                                <reference key="NSControlView" ref="688822305"/>
                                                                        <int key="NSfFlags">1044</int>
                                                                </object>
                                                                <reference key="NSControlView" ref="688822305"/>

-                                                               <int key="NSButtonFlags">-2038152961</int>
+                                                               <int key="NSButtonFlags">914637055</int>

                                                                <int key="NSButtonFlags2">163</int>
                                                                <string key="NSAlternateContents"/>
                                                                <string key="NSKeyEquivalent"/>
                                                                <int key="NSButtonFlags2">163</int>
                                                                <string key="NSAlternateContents"/>
                                                                <string key="NSKeyEquivalent"/>


@@ -1409,7 +1445,7 @@
                                                <object class="NSSlider" id="537997956">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">302</int>
                                                <object class="NSSlider" id="537997956">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">302</int>

-                                                       <string key="NSFrame">{{18, 378}, {644, 21}}</string>
+                                                       <string key="NSFrame">{{18, 374}, {675, 21}}</string>

                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSSliderCell" key="NSCell" id="824648405">
                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSSliderCell" key="NSCell" id="824648405">


@@ -1430,7 +1466,7 @@
                                                <object class="NSTextField" id="1017016876">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">303</int>
                                                <object class="NSTextField" id="1017016876">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">303</int>

-                                                       <string key="NSFrame">{{677, 381}, {182, 17}}</string>
+                                                       <string key="NSFrame">{{710, 383}, {182, 17}}</string>

                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="612951902">
                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="612951902">


@@ -1459,26 +1495,6 @@
                                                                </object>
                                                        </object>
                                                </object>
                                                                </object>
                                                        </object>
                                                </object>

-                                               <object class="NSButton" id="959969197">
-                                                       <reference key="NSNextResponder" ref="439893737"/>
-                                                       <int key="NSvFlags">303</int>
-                                                       <string key="NSFrame">{{1007, 376}, {118, 25}}</string>
-                                                       <reference key="NSSuperview" ref="439893737"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSButtonCell" key="NSCell" id="420359727">
-                                                               <int key="NSCellFlags">-2080244224</int>
-                                                               <int key="NSCellFlags2">134217728</int>
-                                                               <string key="NSContents">Stop</string>
-                                                               <reference key="NSSupport" ref="1004466011"/>
-                                                               <reference key="NSControlView" ref="959969197"/>
-                                                               <int key="NSButtonFlags">-2038152961</int>
-                                                               <int key="NSButtonFlags2">163</int>
-                                                               <string key="NSAlternateContents"/>
-                                                               <string key="NSKeyEquivalent"/>
-                                                               <int key="NSPeriodicDelay">400</int>
-                                                               <int key="NSPeriodicInterval">75</int>
-                                                       </object>
-                                               </object>

                                                <object class="NSScrollView" id="1000813142">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">314</int>
                                                <object class="NSScrollView" id="1000813142">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">314</int>


@@ -1497,7 +1513,7 @@
                                                                                        <string key="NSClassName">ElisTimeLineView</string>
                                                                                </object>
                                                                        </object>
                                                                                        <string key="NSClassName">ElisTimeLineView</string>
                                                                                </object>
                                                                        </object>

-                                                                       <string key="NSFrame">{{2, 2}, {1204, 331}}</string>
+                                                                       <string key="NSFrame">{{2, 2}, {1223, 331}}</string>

                                                                        <reference key="NSSuperview" ref="1000813142"/>
                                                                        <reference key="NSNextKeyView" ref="490432760"/>
                                                                        <reference key="NSDocView" ref="490432760"/>
                                                                        <reference key="NSSuperview" ref="1000813142"/>
                                                                        <reference key="NSNextKeyView" ref="490432760"/>
                                                                        <reference key="NSDocView" ref="490432760"/>


@@ -1507,7 +1523,7 @@
                                                                <object class="NSScroller" id="893450254">
                                                                        <reference key="NSNextResponder" ref="1000813142"/>
                                                                        <int key="NSvFlags">256</int>
                                                                <object class="NSScroller" id="893450254">
                                                                        <reference key="NSNextResponder" ref="1000813142"/>
                                                                        <int key="NSvFlags">256</int>

-                                                                       <string key="NSFrame">{{1206, 2}, {15, 331}}</string>
+                                                                       <string key="NSFrame">{{1225, 2}, {15, 331}}</string>

                                                                        <reference key="NSSuperview" ref="1000813142"/>
                                                                        <bool key="NSEnabled">YES</bool>
                                                                        <reference key="NSTarget" ref="1000813142"/>
                                                                        <reference key="NSSuperview" ref="1000813142"/>
                                                                        <bool key="NSEnabled">YES</bool>
                                                                        <reference key="NSTarget" ref="1000813142"/>


@@ -1518,19 +1534,18 @@
                                                                <object class="NSScroller" id="318029707">
                                                                        <reference key="NSNextResponder" ref="1000813142"/>
                                                                        <int key="NSvFlags">256</int>
                                                                <object class="NSScroller" id="318029707">
                                                                        <reference key="NSNextResponder" ref="1000813142"/>
                                                                        <int key="NSvFlags">256</int>

-                                                                       <string key="NSFrame">{{2, 333}, {1204, 15}}</string>
+                                                                       <string key="NSFrame">{{2, 333}, {1223, 15}}</string>

                                                                        <reference key="NSSuperview" ref="1000813142"/>
                                                                        <reference key="NSSuperview" ref="1000813142"/>

-                                                                       <bool key="NSEnabled">YES</bool>

                                                                        <int key="NSsFlags">1</int>
                                                                        <reference key="NSTarget" ref="1000813142"/>
                                                                        <string key="NSAction">_doScroller:</string>
                                                                        <int key="NSsFlags">1</int>
                                                                        <reference key="NSTarget" ref="1000813142"/>
                                                                        <string key="NSAction">_doScroller:</string>

-                                                                       <double key="NSPercent">0.99586435070306034</double>
+                                                                       <double key="NSPercent">0.99917287014061207</double>

                                                                </object>
                                                        </object>
                                                                </object>
                                                        </object>

-                                                       <string key="NSFrame">{{19, 20}, {1223, 350}}</string>
+                                                       <string key="NSFrame">{{19, 20}, {1242, 350}}</string>

                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <reference key="NSNextKeyView" ref="163103707"/>
                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <reference key="NSNextKeyView" ref="163103707"/>

-                                                       <int key="NSsFlags">243</int>
+                                                       <int key="NSsFlags">115</int>

                                                        <reference key="NSVScroller" ref="893450254"/>
                                                        <reference key="NSHScroller" ref="318029707"/>
                                                        <reference key="NSContentView" ref="163103707"/>
                                                        <reference key="NSVScroller" ref="893450254"/>
                                                        <reference key="NSHScroller" ref="318029707"/>
                                                        <reference key="NSContentView" ref="163103707"/>


@@ -1538,21 +1553,21 @@
                                                <object class="NSTabView" id="83094786">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">27</int>
                                                <object class="NSTabView" id="83094786">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">27</int>

-                                                       <string key="NSFrame">{{685, 404}, {562, 493}}</string>
+                                                       <string key="NSFrame">{{706, 398}, {562, 515}}</string>

                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <object class="NSMutableArray" key="NSTabViewItems">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>
                                                                <object class="NSTabViewItem" id="615081872">
                                                                        <string key="NSIdentifier">2</string>
                                                                        <object class="NSView" key="NSView" id="511138079">
                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <object class="NSMutableArray" key="NSTabViewItems">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>
                                                                <object class="NSTabViewItem" id="615081872">
                                                                        <string key="NSIdentifier">2</string>
                                                                        <object class="NSView" key="NSView" id="511138079">

-                                                                               <nil key="NSNextResponder"/>
+                                                                               <reference key="NSNextResponder" ref="83094786"/>

                                                                                <int key="NSvFlags">256</int>
                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                        <object class="NSSlider" id="40618378">
                                                                                                <reference key="NSNextResponder" ref="511138079"/>
                                                                                                <int key="NSvFlags">289</int>
                                                                                <int key="NSvFlags">256</int>
                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                        <object class="NSSlider" id="40618378">
                                                                                                <reference key="NSNextResponder" ref="511138079"/>
                                                                                                <int key="NSvFlags">289</int>

-                                                                                               <string key="NSFrame">{{398, 1}, {129, 25}}</string>
+                                                                                               <string key="NSFrame">{{398, 17}, {129, 25}}</string>

                                                                                                <reference key="NSSuperview" ref="511138079"/>
                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                <object class="NSSliderCell" key="NSCell" id="859396821">
                                                                                                <reference key="NSSuperview" ref="511138079"/>
                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                <object class="NSSliderCell" key="NSCell" id="859396821">


@@ -1740,7 +1755,7 @@
                                                                                                                                                <string>NeXT TIFF v4.0 pasteboard type</string>
                                                                                                                                        </object>
                                                                                                                                </object>
                                                                                                                                                <string>NeXT TIFF v4.0 pasteboard type</string>
                                                                                                                                        </object>
                                                                                                                                </object>

-                                                                                                                               <string key="NSFrameSize">{531, 410}</string>
+                                                                                                                               <string key="NSFrameSize">{531, 415}</string>

                                                                                                                                <reference key="NSSuperview" ref="218126195"/>
                                                                                                                                <bool key="constrainsToOriginalSize">NO</bool>
                                                                                                                                <bool key="cellsHaveSubtitle">NO</bool>
                                                                                                                                <reference key="NSSuperview" ref="218126195"/>
                                                                                                                                <bool key="constrainsToOriginalSize">NO</bool>
                                                                                                                                <bool key="cellsHaveSubtitle">NO</bool>


@@ -1756,7 +1771,7 @@
                                                                                                                                <reference key="delegate"/>
                                                                                                                        </object>
                                                                                                                </object>
                                                                                                                                <reference key="delegate"/>
                                                                                                                        </object>
                                                                                                                </object>

-                                                                                                               <string key="NSFrame">{{1, 1}, {531, 410}}</string>
+                                                                                                               <string key="NSFrame">{{1, 1}, {531, 415}}</string>

                                                                                                                <reference key="NSSuperview" ref="1060451029"/>
                                                                                                                <reference key="NSNextKeyView" ref="517467101"/>
                                                                                                                <reference key="NSDocView" ref="517467101"/>
                                                                                                                <reference key="NSSuperview" ref="1060451029"/>
                                                                                                                <reference key="NSNextKeyView" ref="517467101"/>
                                                                                                                <reference key="NSDocView" ref="517467101"/>


@@ -1766,7 +1781,7 @@
                                                                                                        <object class="NSScroller" id="959877839">
                                                                                                                <reference key="NSNextResponder" ref="1060451029"/>
                                                                                                                <int key="NSvFlags">256</int>
                                                                                                        <object class="NSScroller" id="959877839">
                                                                                                                <reference key="NSNextResponder" ref="1060451029"/>
                                                                                                                <int key="NSvFlags">256</int>

-                                                                                                               <string key="NSFrame">{{532, 1}, {15, 410}}</string>
+                                                                                                               <string key="NSFrame">{{532, 1}, {15, 415}}</string>

                                                                                                                <reference key="NSSuperview" ref="1060451029"/>
                                                                                                                <reference key="NSTarget" ref="1060451029"/>
                                                                                                                <string key="NSAction">_doScroller:</string>
                                                                                                                <reference key="NSSuperview" ref="1060451029"/>
                                                                                                                <reference key="NSTarget" ref="1060451029"/>
                                                                                                                <string key="NSAction">_doScroller:</string>


@@ -1784,7 +1799,7 @@
                                                                                                                <double key="NSPercent">0.50602412223815918</double>
                                                                                                        </object>
                                                                                                </object>
                                                                                                                <double key="NSPercent">0.50602412223815918</double>
                                                                                                        </object>
                                                                                                </object>

-                                                                                               <string key="NSFrame">{{-3, 32}, {548, 412}}</string>
+                                                                                               <string key="NSFrame">{{-3, 49}, {548, 417}}</string>

                                                                                                <reference key="NSSuperview" ref="511138079"/>
                                                                                                <reference key="NSNextKeyView" ref="218126195"/>
                                                                                                <int key="NSsFlags">18</int>
                                                                                                <reference key="NSSuperview" ref="511138079"/>
                                                                                                <reference key="NSNextKeyView" ref="218126195"/>
                                                                                                <int key="NSsFlags">18</int>


@@ -1794,7 +1809,8 @@
                                                                                                <bytes key="NSScrollAmts">QSAAAEEgAABC8gAAQwgAAA</bytes>
                                                                                        </object>
                                                                                </object>
                                                                                                <bytes key="NSScrollAmts">QSAAAEEgAABC8gAAQwgAAA</bytes>
                                                                                        </object>
                                                                                </object>

-                                                                               <string key="NSFrame">{{10, 33}, {542, 447}}</string>
+                                                                               <string key="NSFrame">{{10, 33}, {542, 469}}</string>
+                                                                               <reference key="NSSuperview" ref="83094786"/>

                                                                        </object>
                                                                        <string key="NSLabel">Media Browser</string>
                                                                        <reference key="NSColor" ref="4404863"/>
                                                                        </object>
                                                                        <string key="NSLabel">Media Browser</string>
                                                                        <reference key="NSColor" ref="4404863"/>


@@ -1803,7 +1819,7 @@
                                                                <object class="NSTabViewItem" id="1049445031">
                                                                        <string key="NSIdentifier">Item 2</string>
                                                                        <object class="NSView" key="NSView" id="829686118">
                                                                <object class="NSTabViewItem" id="1049445031">
                                                                        <string key="NSIdentifier">Item 2</string>
                                                                        <object class="NSView" key="NSView" id="829686118">

-                                                                               <reference key="NSNextResponder" ref="83094786"/>
+                                                                               <nil key="NSNextResponder"/>

                                                                                <int key="NSvFlags">256</int>
                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                <int key="NSvFlags">256</int>
                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>


@@ -1820,30 +1836,7 @@
                                                                                                                        <object class="NSTextView" id="894122042">
                                                                                                                                <reference key="NSNextResponder" ref="676423734"/>
                                                                                                                                <int key="NSvFlags">2322</int>
                                                                                                                        <object class="NSTextView" id="894122042">
                                                                                                                                <reference key="NSNextResponder" ref="676423734"/>
                                                                                                                                <int key="NSvFlags">2322</int>

-                                                                                                                               <object class="NSMutableSet" key="NSDragTypes">
-                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                                                       <object class="NSArray" key="set.sortedObjects">
-                                                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                                                               <string>Apple HTML pasteboard type</string>
-                                                                                                                                               <string>Apple PDF pasteboard type</string>
-                                                                                                                                               <string>Apple PICT pasteboard type</string>
-                                                                                                                                               <string>Apple PNG pasteboard type</string>
-                                                                                                                                               <string>Apple URL pasteboard type</string>
-                                                                                                                                               <string>CorePasteboardFlavorType 0x6D6F6F76</string>
-                                                                                                                                               <string>NSColor pasteboard type</string>
-                                                                                                                                               <string>NSFilenamesPboardType</string>
-                                                                                                                                               <string>NSStringPboardType</string>
-                                                                                                                                               <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-                                                                                                                                               <string>NeXT RTFD pasteboard type</string>
-                                                                                                                                               <string>NeXT Rich Text Format v1.0 pasteboard type</string>
-                                                                                                                                               <string>NeXT TIFF v4.0 pasteboard type</string>
-                                                                                                                                               <string>NeXT font pasteboard type</string>
-                                                                                                                                               <string>NeXT ruler pasteboard type</string>
-                                                                                                                                               <string>WebURLsWithTitlesPboardType</string>
-                                                                                                                                               <string>public.url</string>
-                                                                                                                                       </object>
-                                                                                                                               </object>
-                                                                                                                               <string key="NSFrameSize">{491, 14}</string>
+                                                                                                                               <string key="NSFrameSize">{491, 36}</string>

                                                                                                                                <reference key="NSSuperview" ref="676423734"/>
                                                                                                                                <object class="NSTextContainer" key="NSTextContainer" id="643847126">
                                                                                                                                        <object class="NSLayoutManager" key="NSLayoutManager">
                                                                                                                                <reference key="NSSuperview" ref="676423734"/>
                                                                                                                                <object class="NSTextContainer" key="NSTextContainer" id="643847126">
                                                                                                                                        <object class="NSLayoutManager" key="NSLayoutManager">


@@ -1920,12 +1913,12 @@
                                                                                                                                        <nil key="NSDefaultParagraphStyle"/>
                                                                                                                                </object>
                                                                                                                                <int key="NSTVFlags">6</int>
                                                                                                                                        <nil key="NSDefaultParagraphStyle"/>
                                                                                                                                </object>
                                                                                                                                <int key="NSTVFlags">6</int>

-                                                                                                                               <string key="NSMaxSize">{493, 1e+07}</string>
-                                                                                                                               <string key="NSMinize">{223, 4}</string>
+                                                                                                                               <string key="NSMaxSize">{999, 1e+07}</string>
+                                                                                                                               <string key="NSMinize">{223, 0}</string>

                                                                                                                                <nil key="NSDelegate"/>
                                                                                                                        </object>
                                                                                                                </object>
                                                                                                                                <nil key="NSDelegate"/>
                                                                                                                        </object>
                                                                                                                </object>

-                                                                                                               <string key="NSFrame">{{1, 1}, {491, 425}}</string>
+                                                                                                               <string key="NSFrame">{{1, 1}, {491, 447}}</string>

                                                                                                                <reference key="NSSuperview" ref="291824860"/>
                                                                                                                <reference key="NSNextKeyView" ref="894122042"/>
                                                                                                                <reference key="NSDocView" ref="894122042"/>
                                                                                                                <reference key="NSSuperview" ref="291824860"/>
                                                                                                                <reference key="NSNextKeyView" ref="894122042"/>
                                                                                                                <reference key="NSDocView" ref="894122042"/>


@@ -1942,7 +1935,7 @@
                                                                                                        <object class="NSScroller" id="330248010">
                                                                                                                <reference key="NSNextResponder" ref="291824860"/>
                                                                                                                <int key="NSvFlags">256</int>
                                                                                                        <object class="NSScroller" id="330248010">
                                                                                                                <reference key="NSNextResponder" ref="291824860"/>
                                                                                                                <int key="NSvFlags">256</int>

-                                                                                                               <string key="NSFrame">{{492, 1}, {15, 425}}</string>
+                                                                                                               <string key="NSFrame">{{492, 1}, {15, 447}}</string>

                                                                                                                <reference key="NSSuperview" ref="291824860"/>
                                                                                                                <reference key="NSTarget" ref="291824860"/>
                                                                                                                <string key="NSAction">_doScroller:</string>
                                                                                                                <reference key="NSSuperview" ref="291824860"/>
                                                                                                                <reference key="NSTarget" ref="291824860"/>
                                                                                                                <string key="NSAction">_doScroller:</string>


@@ -1960,7 +1953,7 @@
                                                                                                                <double key="NSPercent">0.94565218687057495</double>
                                                                                                        </object>
                                                                                                </object>
                                                                                                                <double key="NSPercent">0.94565218687057495</double>
                                                                                                        </object>
                                                                                                </object>

-                                                                                               <string key="NSFrame">{{17, 17}, {508, 427}}</string>
+                                                                                               <string key="NSFrame">{{17, 17}, {508, 449}}</string>

                                                                                                <reference key="NSSuperview" ref="829686118"/>
                                                                                                <reference key="NSNextKeyView" ref="676423734"/>
                                                                                                <int key="NSsFlags">18</int>
                                                                                                <reference key="NSSuperview" ref="829686118"/>
                                                                                                <reference key="NSNextKeyView" ref="676423734"/>
                                                                                                <int key="NSsFlags">18</int>


@@ -1969,8 +1962,7 @@
                                                                                                <reference key="NSContentView" ref="676423734"/>
                                                                                        </object>
                                                                                </object>
                                                                                                <reference key="NSContentView" ref="676423734"/>
                                                                                        </object>
                                                                                </object>

-                                                                               <string key="NSFrame">{{10, 33}, {542, 447}}</string>
-                                                                               <reference key="NSSuperview" ref="83094786"/>
+                                                                               <string key="NSFrame">{{10, 33}, {542, 469}}</string>

                                                                        </object>
                                                                        <string key="NSLabel">Text</string>
                                                                        <reference key="NSColor" ref="4404863"/>
                                                                        </object>
                                                                        <string key="NSLabel">Text</string>
                                                                        <reference key="NSColor" ref="4404863"/>


@@ -1996,7 +1988,7 @@
                                                                                                                        <object class="NSTableView" id="719432318">
                                                                                                                                <reference key="NSNextResponder" ref="41398149"/>
                                                                                                                                <int key="NSvFlags">256</int>
                                                                                                                        <object class="NSTableView" id="719432318">
                                                                                                                                <reference key="NSNextResponder" ref="41398149"/>
                                                                                                                                <int key="NSvFlags">256</int>

-                                                                                                                               <string key="NSFrameSize">{546, 380}</string>
+                                                                                                                               <string key="NSFrameSize">{546, 399}</string>

                                                                                                                                <reference key="NSSuperview" ref="41398149"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                                                <object class="NSTableHeaderView" key="NSHeaderView" id="1067082184">
                                                                                                                                <reference key="NSSuperview" ref="41398149"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                                                <object class="NSTableHeaderView" key="NSHeaderView" id="1067082184">


@@ -2145,7 +2137,7 @@
                                                                                                                                <int key="NSTableViewDraggingDestinationStyle">0</int>
                                                                                                                        </object>
                                                                                                                </object>
                                                                                                                                <int key="NSTableViewDraggingDestinationStyle">0</int>
                                                                                                                        </object>
                                                                                                                </object>

-                                                                                                               <string key="NSFrame">{{1, 17}, {546, 380}}</string>
+                                                                                                               <string key="NSFrame">{{1, 17}, {546, 399}}</string>

                                                                                                                <reference key="NSSuperview" ref="1059673670"/>
                                                                                                                <reference key="NSNextKeyView" ref="719432318"/>
                                                                                                                <reference key="NSDocView" ref="719432318"/>
                                                                                                                <reference key="NSSuperview" ref="1059673670"/>
                                                                                                                <reference key="NSNextKeyView" ref="719432318"/>
                                                                                                                <reference key="NSDocView" ref="719432318"/>


@@ -2188,7 +2180,7 @@
                                                                                                        </object>
                                                                                                        <reference ref="564414286"/>
                                                                                                </object>
                                                                                                        </object>
                                                                                                        <reference ref="564414286"/>
                                                                                                </object>

-                                                                                               <string key="NSFrame">{{-3, 46}, {548, 398}}</string>
+                                                                                               <string key="NSFrame">{{-3, 49}, {548, 417}}</string>

                                                                                                <reference key="NSSuperview" ref="82189399"/>
                                                                                                <reference key="NSNextKeyView" ref="41398149"/>
                                                                                                <int key="NSsFlags">562</int>
                                                                                                <reference key="NSSuperview" ref="82189399"/>
                                                                                                <reference key="NSNextKeyView" ref="41398149"/>
                                                                                                <int key="NSsFlags">562</int>


@@ -2202,7 +2194,7 @@
                                                                                        <object class="NSButton" id="170867592">
                                                                                                <reference key="NSNextResponder" ref="82189399"/>
                                                                                                <int key="NSvFlags">292</int>
                                                                                        <object class="NSButton" id="170867592">
                                                                                                <reference key="NSNextResponder" ref="82189399"/>
                                                                                                <int key="NSvFlags">292</int>

-                                                                                               <string key="NSFrame">{{17, 3}, {155, 25}}</string>
+                                                                                               <string key="NSFrame">{{17, 15}, {155, 25}}</string>

                                                                                                <reference key="NSSuperview" ref="82189399"/>
                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                <object class="NSButtonCell" key="NSCell" id="554909128">
                                                                                                <reference key="NSSuperview" ref="82189399"/>
                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                <object class="NSButtonCell" key="NSCell" id="554909128">


@@ -2222,7 +2214,7 @@
                                                                                        <object class="NSButton" id="701732987">
                                                                                                <reference key="NSNextResponder" ref="82189399"/>
                                                                                                <int key="NSvFlags">289</int>
                                                                                        <object class="NSButton" id="701732987">
                                                                                                <reference key="NSNextResponder" ref="82189399"/>
                                                                                                <int key="NSvFlags">289</int>

-                                                                                               <string key="NSFrame">{{377, 3}, {148, 25}}</string>
+                                                                                               <string key="NSFrame">{{377, 15}, {148, 25}}</string>

                                                                                                <reference key="NSSuperview" ref="82189399"/>
                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                <object class="NSButtonCell" key="NSCell" id="260964257">
                                                                                                <reference key="NSSuperview" ref="82189399"/>
                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                <object class="NSButtonCell" key="NSCell" id="260964257">


@@ -2240,28 +2232,28 @@
                                                                                                </object>
                                                                                        </object>
                                                                                </object>
                                                                                                </object>
                                                                                        </object>
                                                                                </object>

-                                                                               <string key="NSFrame">{{10, 33}, {542, 447}}</string>
+                                                                               <string key="NSFrame">{{10, 33}, {542, 469}}</string>

                                                                        </object>
                                                                        <string key="NSLabel">Property</string>
                                                                        <reference key="NSColor" ref="4404863"/>
                                                                        <reference key="NSTabView" ref="83094786"/>
                                                                </object>
                                                        </object>
                                                                        </object>
                                                                        <string key="NSLabel">Property</string>
                                                                        <reference key="NSColor" ref="4404863"/>
                                                                        <reference key="NSTabView" ref="83094786"/>
                                                                </object>
                                                        </object>

-                                                       <reference key="NSSelectedTabViewItem" ref="1049445031"/>
+                                                       <reference key="NSSelectedTabViewItem" ref="615081872"/>

                                                        <reference key="NSFont" ref="1004466011"/>
                                                        <int key="NSTvFlags">0</int>
                                                        <bool key="NSAllowTruncatedLabels">YES</bool>
                                                        <bool key="NSDrawsBackground">YES</bool>
                                                        <object class="NSMutableArray" key="NSSubviews">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference key="NSFont" ref="1004466011"/>
                                                        <int key="NSTvFlags">0</int>
                                                        <bool key="NSAllowTruncatedLabels">YES</bool>
                                                        <bool key="NSDrawsBackground">YES</bool>
                                                        <object class="NSMutableArray" key="NSSubviews">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>

-                                                               <reference ref="829686118"/>
+                                                               <reference ref="511138079"/>

                                                        </object>
                                                </object>
                                                <object class="NSOpenGLView" id="132559063">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">1310</int>
                                                        <object class="NSPSMatrix" key="NSDrawMatrix"/>
                                                        </object>
                                                </object>
                                                <object class="NSOpenGLView" id="132559063">
                                                        <reference key="NSNextResponder" ref="439893737"/>
                                                        <int key="NSvFlags">1310</int>
                                                        <object class="NSPSMatrix" key="NSDrawMatrix"/>

-                                                       <string key="NSFrame">{{19, 414}, {640, 480}}</string>
+                                                       <string key="NSFrame">{{19, 407}, {672, 500}}</string>

                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <object class="NSOpenGLPixelFormat" key="NSPixelFormat">
                                                                <object class="NSMutableData" key="NSPixelAttributes">
                                                        <reference key="NSSuperview" ref="439893737"/>
                                                        <object class="NSOpenGLPixelFormat" key="NSPixelFormat">
                                                                <object class="NSMutableData" key="NSPixelAttributes">


@@ -2269,8 +2261,48 @@
                                                                </object>
                                                        </object>
                                                </object>
                                                                </object>
                                                        </object>
                                                </object>

+                                               <object class="NSButton" id="363455375">
+                                                       <reference key="NSNextResponder" ref="439893737"/>
+                                                       <int key="NSvFlags">301</int>
+                                                       <string key="NSFrame">{{884, 376}, {40, 25}}</string>
+                                                       <reference key="NSSuperview" ref="439893737"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSButtonCell" key="NSCell" id="373456771">
+                                                               <int key="NSCellFlags">-2080244224</int>
+                                                               <int key="NSCellFlags2">134217728</int>
+                                                               <string key="NSContents">&lt;&lt;</string>
+                                                               <reference key="NSSupport" ref="1004466011"/>
+                                                               <reference key="NSControlView" ref="363455375"/>
+                                                               <int key="NSButtonFlags">-2038152961</int>
+                                                               <int key="NSButtonFlags2">163</int>
+                                                               <string key="NSAlternateContents"/>
+                                                               <string key="NSKeyEquivalent"/>
+                                                               <int key="NSPeriodicDelay">400</int>
+                                                               <int key="NSPeriodicInterval">75</int>
+                                                       </object>
+                                               </object>
+                                               <object class="NSButton" id="404189014">
+                                                       <reference key="NSNextResponder" ref="439893737"/>
+                                                       <int key="NSvFlags">301</int>
+                                                       <string key="NSFrame">{{1049, 376}, {40, 25}}</string>
+                                                       <reference key="NSSuperview" ref="439893737"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSButtonCell" key="NSCell" id="809193831">
+                                                               <int key="NSCellFlags">-2080244224</int>
+                                                               <int key="NSCellFlags2">134217728</int>
+                                                               <string key="NSContents">&gt;&gt;</string>
+                                                               <reference key="NSSupport" ref="1004466011"/>
+                                                               <reference key="NSControlView" ref="404189014"/>
+                                                               <int key="NSButtonFlags">-2038152961</int>
+                                                               <int key="NSButtonFlags2">163</int>
+                                                               <string key="NSAlternateContents"/>
+                                                               <string key="NSKeyEquivalent"/>
+                                                               <int key="NSPeriodicDelay">400</int>
+                                                               <int key="NSPeriodicInterval">75</int>
+                                                       </object>
+                                               </object>

                                        </object>
                                        </object>

-                                       <string key="NSFrameSize">{1262, 911}</string>
+                                       <string key="NSFrameSize">{1281, 927}</string>

                                        <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
                                        <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>


@@ -2970,14 +3002,6 @@
                                        <int key="connectionID">541</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <int key="connectionID">541</int>
                                </object>
                                <object class="IBConnectionRecord">

-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">startPlay:</string>
-                                               <reference key="source" ref="690852348"/>
-                                               <reference key="destination" ref="688822305"/>
-                                       </object>
-                                       <int key="connectionID">544</int>
-                               </object>
-                               <object class="IBConnectionRecord">

                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">timeCodeField</string>
                                                <reference key="source" ref="690852348"/>
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">timeCodeField</string>
                                                <reference key="source" ref="690852348"/>


@@ -3002,14 +3026,6 @@
                                        <int key="connectionID">554</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <int key="connectionID">554</int>
                                </object>
                                <object class="IBConnectionRecord">

-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">stopPlay:</string>
-                                               <reference key="source" ref="690852348"/>
-                                               <reference key="destination" ref="959969197"/>
-                                       </object>
-                                       <int key="connectionID">557</int>
-                               </object>
-                               <object class="IBConnectionRecord">

                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">_timeLineController</string>
                                                <reference key="source" ref="690852348"/>
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">_timeLineController</string>
                                                <reference key="source" ref="690852348"/>


@@ -3226,14 +3242,6 @@
                                        <int key="connectionID">636</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <int key="connectionID">636</int>
                                </object>
                                <object class="IBConnectionRecord">

-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">changeToSmallWindiw:</string>
-                                               <reference key="source" ref="690852348"/>
-                                               <reference key="destination" ref="387527700"/>
-                                       </object>
-                                       <int key="connectionID">646</int>
-                               </object>
-                               <object class="IBConnectionRecord">

                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">_mainController</string>
                                                <reference key="source" ref="943689817"/>
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">_mainController</string>
                                                <reference key="source" ref="943689817"/>


@@ -3275,14 +3283,6 @@
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">

-                                               <string key="label">changeMovieSize:</string>
-                                               <reference key="source" ref="690852348"/>
-                                               <reference key="destination" ref="999140926"/>
-                                       </object>
-                                       <int key="connectionID">662</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">

                                                <string key="label">preference:</string>
                                                <reference key="source" ref="690852348"/>
                                                <reference key="destination" ref="609285721"/>
                                                <string key="label">preference:</string>
                                                <reference key="source" ref="690852348"/>
                                                <reference key="destination" ref="609285721"/>


@@ -3329,6 +3329,70 @@
                                        </object>
                                        <int key="connectionID">686</int>
                                </object>
                                        </object>
                                        <int key="connectionID">686</int>
                                </object>

+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">changeMovieSpeed:</string>
+                                               <reference key="source" ref="690852348"/>
+                                               <reference key="destination" ref="206868603"/>
+                                       </object>
+                                       <int key="connectionID">688</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">gotoNextKeyTime:</string>
+                                               <reference key="source" ref="690852348"/>
+                                               <reference key="destination" ref="210896482"/>
+                                       </object>
+                                       <int key="connectionID">691</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">gotoPrevKeyTime:</string>
+                                               <reference key="source" ref="690852348"/>
+                                               <reference key="destination" ref="788379769"/>
+                                       </object>
+                                       <int key="connectionID">693</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">gotoPrevKeyTime:</string>
+                                               <reference key="source" ref="690852348"/>
+                                               <reference key="destination" ref="363455375"/>
+                                       </object>
+                                       <int key="connectionID">700</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">gotoNextKeyTime:</string>
+                                               <reference key="source" ref="690852348"/>
+                                               <reference key="destination" ref="404189014"/>
+                                       </object>
+                                       <int key="connectionID">701</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">playStop:</string>
+                                               <reference key="source" ref="690852348"/>
+                                               <reference key="destination" ref="688822305"/>
+                                       </object>
+                                       <int key="connectionID">702</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">_playstopButton</string>
+                                               <reference key="source" ref="690852348"/>
+                                               <reference key="destination" ref="688822305"/>
+                                       </object>
+                                       <int key="connectionID">703</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">changeMovieSize:</string>
+                                               <reference key="source" ref="690852348"/>
+                                               <reference key="destination" ref="633557527"/>
+                                       </object>
+                                       <int key="connectionID">705</int>
+                               </object>

                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">


@@ -3425,6 +3489,8 @@
                                                        <reference ref="579971712"/>
                                                        <reference ref="1010469920"/>
                                                        <reference ref="701888385"/>
                                                        <reference ref="579971712"/>
                                                        <reference ref="1010469920"/>
                                                        <reference ref="701888385"/>

+                                                       <reference ref="633557527"/>
+                                                       <reference ref="42541374"/>

                                                </object>
                                                <reference key="parent" ref="379814623"/>
                                        </object>
                                                </object>
                                                <reference key="parent" ref="379814623"/>
                                        </object>


@@ -3507,7 +3573,6 @@
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="437104165"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="437104165"/>

-                                                       <reference ref="583158037"/>

                                                        <reference ref="1058277027"/>
                                                        <reference ref="212016141"/>
                                                        <reference ref="296257095"/>
                                                        <reference ref="1058277027"/>
                                                        <reference ref="212016141"/>
                                                        <reference ref="296257095"/>


@@ -3522,8 +3587,12 @@
                                                        <reference ref="288088188"/>
                                                        <reference ref="82994268"/>
                                                        <reference ref="18546122"/>
                                                        <reference ref="288088188"/>
                                                        <reference ref="82994268"/>
                                                        <reference ref="18546122"/>

-                                                       <reference ref="999140926"/>
+                                                       <reference ref="206868603"/>
+                                                       <reference ref="210896482"/>
+                                                       <reference ref="272683826"/>
+                                                       <reference ref="788379769"/>

                                                        <reference ref="785837009"/>
                                                        <reference ref="785837009"/>

+                                                       <reference ref="583158037"/>

                                                </object>
                                                <reference key="parent" ref="952259628"/>
                                        </object>
                                                </object>
                                                <reference key="parent" ref="952259628"/>
                                        </object>


@@ -3673,7 +3742,6 @@
                                                        <reference ref="1046388886"/>
                                                        <reference ref="1056857174"/>
                                                        <reference ref="342932134"/>
                                                        <reference ref="1046388886"/>
                                                        <reference ref="1056857174"/>
                                                        <reference ref="342932134"/>

-                                                       <reference ref="387527700"/>

                                                </object>
                                                <reference key="parent" ref="694149608"/>
                                        </object>
                                                </object>
                                                <reference key="parent" ref="694149608"/>
                                        </object>


@@ -3889,13 +3957,14 @@
                                                <reference key="object" ref="439893737"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                <reference key="object" ref="439893737"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>

+                                                       <reference ref="1000813142"/>

                                                        <reference ref="83094786"/>
                                                        <reference ref="83094786"/>

+                                                       <reference ref="537997956"/>

                                                        <reference ref="132559063"/>
                                                        <reference ref="132559063"/>

-                                                       <reference ref="1000813142"/>
-                                                       <reference ref="1017016876"/>
-                                                       <reference ref="959969197"/>

                                                        <reference ref="688822305"/>
                                                        <reference ref="688822305"/>

-                                                       <reference ref="537997956"/>
+                                                       <reference ref="404189014"/>
+                                                       <reference ref="363455375"/>
+                                                       <reference ref="1017016876"/>

                                                </object>
                                                <reference key="parent" ref="972006081"/>
                                        </object>
                                                </object>
                                                <reference key="parent" ref="972006081"/>
                                        </object>


@@ -4438,20 +4507,6 @@
                                                <reference key="parent" ref="1017016876"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <reference key="parent" ref="1017016876"/>
                                        </object>
                                        <object class="IBObjectRecord">

-                                               <int key="objectID">555</int>
-                                               <reference key="object" ref="959969197"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="420359727"/>
-                                               </object>
-                                               <reference key="parent" ref="439893737"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">556</int>
-                                               <reference key="object" ref="420359727"/>
-                                               <reference key="parent" ref="959969197"/>
-                                       </object>
-                                       <object class="IBObjectRecord">

                                                <int key="objectID">560</int>
                                                <reference key="object" ref="1000813142"/>
                                                <object class="NSMutableArray" key="children">
                                                <int key="objectID">560</int>
                                                <reference key="object" ref="1000813142"/>
                                                <object class="NSMutableArray" key="children">


@@ -4507,9 +4562,9 @@
                                                <reference key="object" ref="82189399"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                <reference key="object" ref="82189399"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>

+                                                       <reference ref="1059673670"/>

                                                        <reference ref="170867592"/>
                                                        <reference ref="701732987"/>
                                                        <reference ref="170867592"/>
                                                        <reference ref="701732987"/>

-                                                       <reference ref="1059673670"/>

                                                </object>
                                                <reference key="parent" ref="722773087"/>
                                        </object>
                                                </object>
                                                <reference key="parent" ref="722773087"/>
                                        </object>


@@ -4527,8 +4582,8 @@
                                                <reference key="object" ref="511138079"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                <reference key="object" ref="511138079"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>

-                                                       <reference ref="40618378"/>

                                                        <reference ref="1060451029"/>
                                                        <reference ref="1060451029"/>

+                                                       <reference ref="40618378"/>

                                                </object>
                                                <reference key="parent" ref="615081872"/>
                                        </object>
                                                </object>
                                                <reference key="parent" ref="615081872"/>
                                        </object>


@@ -4706,26 +4761,11 @@
                                                <reference key="parent" ref="439893737"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <reference key="parent" ref="439893737"/>
                                        </object>
                                        <object class="IBObjectRecord">

-                                               <int key="objectID">645</int>
-                                               <reference key="object" ref="387527700"/>
-                                               <reference key="parent" ref="110575045"/>
-                                       </object>
-                                       <object class="IBObjectRecord">

                                                <int key="objectID">654</int>
                                                <reference key="object" ref="943689817"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">654</int>
                                                <reference key="object" ref="943689817"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
                                        <object class="IBObjectRecord">

-                                               <int key="objectID">660</int>
-                                               <reference key="object" ref="999140926"/>
-                                               <reference key="parent" ref="789758025"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">661</int>
-                                               <reference key="object" ref="785837009"/>
-                                               <reference key="parent" ref="789758025"/>
-                                       </object>
-                                       <object class="IBObjectRecord">

                                                <int key="objectID">668</int>
                                                <reference key="object" ref="1049445031"/>
                                                <object class="NSMutableArray" key="children">
                                                <int key="objectID">668</int>
                                                <reference key="object" ref="1049445031"/>
                                                <object class="NSMutableArray" key="children">


@@ -4769,6 +4809,69 @@
                                                <reference key="object" ref="894122042"/>
                                                <reference key="parent" ref="291824860"/>
                                        </object>
                                                <reference key="object" ref="894122042"/>
                                                <reference key="parent" ref="291824860"/>
                                        </object>

+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">687</int>
+                                               <reference key="object" ref="206868603"/>
+                                               <reference key="parent" ref="789758025"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">689</int>
+                                               <reference key="object" ref="210896482"/>
+                                               <reference key="parent" ref="789758025"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">690</int>
+                                               <reference key="object" ref="272683826"/>
+                                               <reference key="parent" ref="789758025"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">692</int>
+                                               <reference key="object" ref="788379769"/>
+                                               <reference key="parent" ref="789758025"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">696</int>
+                                               <reference key="object" ref="363455375"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="373456771"/>
+                                               </object>
+                                               <reference key="parent" ref="439893737"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">697</int>
+                                               <reference key="object" ref="373456771"/>
+                                               <reference key="parent" ref="363455375"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">698</int>
+                                               <reference key="object" ref="404189014"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="809193831"/>
+                                               </object>
+                                               <reference key="parent" ref="439893737"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">699</int>
+                                               <reference key="object" ref="809193831"/>
+                                               <reference key="parent" ref="404189014"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">704</int>
+                                               <reference key="object" ref="633557527"/>
+                                               <reference key="parent" ref="720053764"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">706</int>
+                                               <reference key="object" ref="42541374"/>
+                                               <reference key="parent" ref="720053764"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">707</int>
+                                               <reference key="object" ref="785837009"/>
+                                               <reference key="parent" ref="789758025"/>
+                                       </object>

                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">


@@ -5003,8 +5106,6 @@
                                        <string>549.IBPluginDependency</string>
                                        <string>550.IBPluginDependency</string>
                                        <string>551.IBPluginDependency</string>
                                        <string>549.IBPluginDependency</string>
                                        <string>550.IBPluginDependency</string>
                                        <string>551.IBPluginDependency</string>

-                                       <string>555.IBPluginDependency</string>
-                                       <string>556.IBPluginDependency</string>

                                        <string>56.IBPluginDependency</string>
                                        <string>56.ImportedFromIB2</string>
                                        <string>560.IBPluginDependency</string>
                                        <string>56.IBPluginDependency</string>
                                        <string>56.ImportedFromIB2</string>
                                        <string>560.IBPluginDependency</string>


@@ -5049,13 +5150,23 @@
                                        <string>610.IBPluginDependency</string>
                                        <string>611.IBPluginDependency</string>
                                        <string>621.IBPluginDependency</string>
                                        <string>610.IBPluginDependency</string>
                                        <string>611.IBPluginDependency</string>
                                        <string>621.IBPluginDependency</string>

-                                       <string>645.IBPluginDependency</string>
-                                       <string>660.IBPluginDependency</string>
-                                       <string>661.IBPluginDependency</string>
+                                       <string>668.IBPluginDependency</string>
+                                       <string>669.IBPluginDependency</string>

                                        <string>679.IBPluginDependency</string>
                                        <string>680.IBPluginDependency</string>
                                        <string>681.IBPluginDependency</string>
                                        <string>682.IBPluginDependency</string>
                                        <string>679.IBPluginDependency</string>
                                        <string>680.IBPluginDependency</string>
                                        <string>681.IBPluginDependency</string>
                                        <string>682.IBPluginDependency</string>

+                                       <string>687.IBPluginDependency</string>
+                                       <string>689.IBPluginDependency</string>
+                                       <string>690.IBPluginDependency</string>
+                                       <string>692.IBPluginDependency</string>
+                                       <string>696.IBPluginDependency</string>
+                                       <string>697.IBPluginDependency</string>
+                                       <string>698.IBPluginDependency</string>
+                                       <string>699.IBPluginDependency</string>
+                                       <string>704.IBPluginDependency</string>
+                                       <string>706.IBPluginDependency</string>
+                                       <string>707.IBPluginDependency</string>

                                        <string>72.IBPluginDependency</string>
                                        <string>72.ImportedFromIB2</string>
                                        <string>73.IBPluginDependency</string>
                                        <string>72.IBPluginDependency</string>
                                        <string>72.ImportedFromIB2</string>
                                        <string>73.IBPluginDependency</string>


@@ -5141,7 +5252,7 @@
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>

-                                       <string>{{258, 694}, {254, 333}}</string>
+                                       <string>{{1431, 668}, {254, 383}}</string>

                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{187, 434}, {243, 243}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{187, 434}, {243, 243}}</string>


@@ -5174,7 +5285,7 @@
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>

-                                       <string>{{753, 217}, {238, 103}}</string>
+                                       <string>{{512, 644}, {238, 103}}</string>

                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{608, 612}, {241, 103}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{608, 612}, {241, 103}}</string>


@@ -5190,7 +5301,7 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{525, 802}, {197, 73}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{525, 802}, {197, 73}}</string>

-                                       <string>{{109, 1027}, {441, 20}}</string>
+                                       <string>{{1282, 1051}, {441, 20}}</string>

                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{74, 862}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{74, 862}</string>


@@ -5215,9 +5326,9 @@
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>

-                                       <string>{{7, 219}, {1262, 911}}</string>
+                                       <string>{{7, 203}, {1281, 927}}</string>

                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>

-                                       <string>{{7, 219}, {1262, 911}}</string>
+                                       <string>{{7, 203}, {1281, 927}}</string>

                                        <integer value="1"/>
                                        <string>{{33, 99}, {480, 360}}</string>
                                        <boolean value="YES"/>
                                        <integer value="1"/>
                                        <string>{{33, 99}, {480, 360}}</string>
                                        <boolean value="YES"/>


@@ -5314,8 +5425,6 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>

-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>

                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>


@@ -5325,7 +5434,7 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>

-                                       <string>{{121, 824}, {240, 203}}</string>
+                                       <string>{{121, 844}, {207, 183}}</string>

                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{23, 794}, {245, 183}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{23, 794}, {245, 183}}</string>


@@ -5374,6 +5483,16 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>

+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>

                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>


@@ -5389,7 +5508,7 @@
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>

-                                       <string>{{216, 804}, {179, 223}}</string>
+                                       <string>{{216, 774}, {219, 253}}</string>

                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{145, 474}, {199, 203}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{145, 474}, {199, 203}}</string>


@@ -5417,7 +5536,7 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
                                </object>
                        </object>
                        <nil key="sourceID"/>

-                       <int key="maxID">686</int>
+                       <int key="maxID">707</int>

                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">


@@ -5430,10 +5549,15 @@
                                                <object class="NSArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>changeMovieSize:</string>
                                                <object class="NSArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>changeMovieSize:</string>

+                                                       <string>changeMovieSpeed:</string>

                                                        <string>changeToSmallWindiw:</string>
                                                        <string>changeToSmallWindiw:</string>

+                                                       <string>cutLayerAtCurrentTime:</string>

                                                        <string>deleteSelectLayer:</string>
                                                        <string>deleteSelectLayer:</string>

+                                                       <string>gotoNextKeyTime:</string>
+                                                       <string>gotoPrevKeyTime:</string>

                                                        <string>openProjectLoadDialog:</string>
                                                        <string>openProjectSaveDialog:</string>
                                                        <string>openProjectLoadDialog:</string>
                                                        <string>openProjectSaveDialog:</string>

+                                                       <string>playStop:</string>

                                                        <string>preference:</string>
                                                        <string>recordingStateChanged:</string>
                                                        <string>redo:</string>
                                                        <string>preference:</string>
                                                        <string>recordingStateChanged:</string>
                                                        <string>redo:</string>


@@ -5464,6 +5588,11 @@
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>

+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>

                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" key="outlets">
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" key="outlets">


@@ -5472,6 +5601,7 @@
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>_mainView</string>
                                                        <string>_mainWindow</string>
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>_mainView</string>
                                                        <string>_mainWindow</string>

+                                                       <string>_playstopButton</string>

                                                        <string>_tableController</string>
                                                        <string>_textLayerField</string>
                                                        <string>_timeLineController</string>
                                                        <string>_tableController</string>
                                                        <string>_textLayerField</string>
                                                        <string>_timeLineController</string>


@@ -5483,6 +5613,7 @@
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>ElisMainView</string>
                                                        <string>NSWindow</string>
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>ElisMainView</string>
                                                        <string>NSWindow</string>

+                                                       <string>NSButton</string>

                                                        <string>ElisPropertyTableController</string>
                                                        <string>NSTextView</string>
                                                        <string>ElisTimeLineController</string>
                                                        <string>ElisPropertyTableController</string>
                                                        <string>NSTextView</string>
                                                        <string>ElisTimeLineController</string>


@@ -6571,7 +6702,7 @@
                <int key="IBDocument.localizationMode">0</int>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
                <int key="IBDocument.localizationMode">0</int>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>

-                       <integer value="1060" key="NS.object.0"/>
+                       <integer value="1050" key="NS.object.0"/>

                </object>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
                </object>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>

diff --git a/English.lproj/speed.xib b/English.lproj/speed.xib
new file mode 100644 (file)
index 0000000..f5a7d77
--- /dev/null
+++ b/English.lproj/speed.xib
@@ -0,0 +1,1035 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+       <data>
+               <int key="IBDocument.SystemTarget">1060</int>
+               <string key="IBDocument.SystemVersion">10B504</string>
+               <string key="IBDocument.InterfaceBuilderVersion">732</string>
+               <string key="IBDocument.AppKitVersion">1038.2</string>
+               <string key="IBDocument.HIToolboxVersion">437.00</string>
+               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                       <string key="NS.object.0">732</string>
+               </object>
+               <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+                       <bool key="EncodedWithXMLCoder">YES</bool>
+                       <integer value="2"/>
+               </object>
+               <object class="NSArray" key="IBDocument.PluginDependencies">
+                       <bool key="EncodedWithXMLCoder">YES</bool>
+                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.Metadata">
+                       <bool key="EncodedWithXMLCoder">YES</bool>
+                       <object class="NSArray" key="dict.sortedKeys" id="0">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                       </object>
+                       <object class="NSMutableArray" key="dict.values">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                       </object>
+               </object>
+               <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <bool key="EncodedWithXMLCoder">YES</bool>
+                       <object class="NSCustomObject" id="1001">
+                               <string key="NSClassName">ElisMovieSpeedController</string>
+                       </object>
+                       <object class="NSCustomObject" id="1003">
+                               <string key="NSClassName">FirstResponder</string>
+                       </object>
+                       <object class="NSCustomObject" id="1004">
+                               <string key="NSClassName">NSApplication</string>
+                       </object>
+                       <object class="NSWindowTemplate" id="652066156">
+                               <int key="NSWindowStyleMask">31</int>
+                               <int key="NSWindowBacking">2</int>
+                               <string key="NSWindowRect">{{230, 414}, {298, 127}}</string>
+                               <int key="NSWTFlags">-1535639552</int>
+                               <string key="NSWindowTitle">Window</string>
+                               <string key="NSWindowClass">NSPanel</string>
+                               <nil key="NSViewClass"/>
+                               <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+                               <object class="NSView" key="NSWindowView" id="524609329">
+                                       <reference key="NSNextResponder"/>
+                                       <int key="NSvFlags">256</int>
+                                       <object class="NSMutableArray" key="NSSubviews">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSTextField" id="63381136">
+                                                       <reference key="NSNextResponder" ref="524609329"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{17, 90}, {42, 17}}</string>
+                                                       <reference key="NSSuperview" ref="524609329"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="202326148">
+                                                               <int key="NSCellFlags">68288064</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents">Speed</string>
+                                                               <object class="NSFont" key="NSSupport" id="72223628">
+                                                                       <string key="NSName">LucidaGrande</string>
+                                                                       <double key="NSSize">13</double>
+                                                                       <int key="NSfFlags">1044</int>
+                                                               </object>
+                                                               <reference key="NSControlView" ref="63381136"/>
+                                                               <object class="NSColor" key="NSBackgroundColor" id="986105267">
+                                                                       <int key="NSColorSpace">6</int>
+                                                                       <string key="NSCatalogName">System</string>
+                                                                       <string key="NSColorName">controlColor</string>
+                                                                       <object class="NSColor" key="NSColor">
+                                                                               <int key="NSColorSpace">3</int>
+                                                                               <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+                                                                       </object>
+                                                               </object>
+                                                               <object class="NSColor" key="NSTextColor" id="428990045">
+                                                                       <int key="NSColorSpace">6</int>
+                                                                       <string key="NSCatalogName">System</string>
+                                                                       <string key="NSColorName">controlTextColor</string>
+                                                                       <object class="NSColor" key="NSColor" id="782144000">
+                                                                               <int key="NSColorSpace">3</int>
+                                                                               <bytes key="NSWhite">MAA</bytes>
+                                                                       </object>
+                                                               </object>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="360163659">
+                                                       <reference key="NSNextResponder" ref="524609329"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{64, 85}, {96, 22}}</string>
+                                                       <reference key="NSSuperview" ref="524609329"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="262034013">
+                                                               <int key="NSCellFlags">-1804468671</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents"/>
+                                                               <reference key="NSSupport" ref="72223628"/>
+                                                               <reference key="NSControlView" ref="360163659"/>
+                                                               <bool key="NSDrawsBackground">YES</bool>
+                                                               <object class="NSColor" key="NSBackgroundColor">
+                                                                       <int key="NSColorSpace">6</int>
+                                                                       <string key="NSCatalogName">System</string>
+                                                                       <string key="NSColorName">textBackgroundColor</string>
+                                                                       <object class="NSColor" key="NSColor">
+                                                                               <int key="NSColorSpace">3</int>
+                                                                               <bytes key="NSWhite">MQA</bytes>
+                                                                       </object>
+                                                               </object>
+                                                               <object class="NSColor" key="NSTextColor">
+                                                                       <int key="NSColorSpace">6</int>
+                                                                       <string key="NSCatalogName">System</string>
+                                                                       <string key="NSColorName">textColor</string>
+                                                                       <reference key="NSColor" ref="782144000"/>
+                                                               </object>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="1035583642">
+                                                       <reference key="NSNextResponder" ref="524609329"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{165, 90}, {38, 17}}</string>
+                                                       <reference key="NSSuperview" ref="524609329"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="31432533">
+                                                               <int key="NSCellFlags">68288064</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents">%</string>
+                                                               <reference key="NSSupport" ref="72223628"/>
+                                                               <reference key="NSControlView" ref="1035583642"/>
+                                                               <reference key="NSBackgroundColor" ref="986105267"/>
+                                                               <reference key="NSTextColor" ref="428990045"/>
+                                                       </object>
+                                               </object>
+                                               <object class="NSButton" id="868746641">
+                                                       <reference key="NSNextResponder" ref="524609329"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{160, 18}, {118, 25}}</string>
+                                                       <reference key="NSSuperview" ref="524609329"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSButtonCell" key="NSCell" id="17338870">
+                                                               <int key="NSCellFlags">-2080244224</int>
+                                                               <int key="NSCellFlags2">134217728</int>
+                                                               <string key="NSContents">OK</string>
+                                                               <reference key="NSSupport" ref="72223628"/>
+                                                               <reference key="NSControlView" ref="868746641"/>
+                                                               <int key="NSButtonFlags">-2038152961</int>
+                                                               <int key="NSButtonFlags2">163</int>
+                                                               <string key="NSAlternateContents"/>
+                                                               <string key="NSKeyEquivalent"/>
+                                                               <int key="NSPeriodicDelay">400</int>
+                                                               <int key="NSPeriodicInterval">75</int>
+                                                       </object>
+                                               </object>
+                                               <object class="NSButton" id="957025783">
+                                                       <reference key="NSNextResponder" ref="524609329"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{20, 18}, {118, 25}}</string>
+                                                       <reference key="NSSuperview" ref="524609329"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSButtonCell" key="NSCell" id="693310967">
+                                                               <int key="NSCellFlags">-2080244224</int>
+                                                               <int key="NSCellFlags2">134217728</int>
+                                                               <string key="NSContents">Cancel</string>
+                                                               <reference key="NSSupport" ref="72223628"/>
+                                                               <reference key="NSControlView" ref="957025783"/>
+                                                               <int key="NSButtonFlags">-2038152961</int>
+                                                               <int key="NSButtonFlags2">163</int>
+                                                               <string key="NSAlternateContents"/>
+                                                               <string key="NSKeyEquivalent"/>
+                                                               <int key="NSPeriodicDelay">400</int>
+                                                               <int key="NSPeriodicInterval">75</int>
+                                                       </object>
+                                               </object>
+                                       </object>
+                                       <string key="NSFrameSize">{298, 127}</string>
+                                       <reference key="NSSuperview"/>
+                               </object>
+                               <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+                               <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+                       </object>
+               </object>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <object class="NSMutableArray" key="connectionRecords">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">pushedOK:</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="868746641"/>
+                                       </object>
+                                       <int key="connectionID">13</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">pushedCancel:</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="957025783"/>
+                                       </object>
+                                       <int key="connectionID">14</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">speedField</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="360163659"/>
+                                       </object>
+                                       <int key="connectionID">15</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">_speedField</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="360163659"/>
+                                       </object>
+                                       <int key="connectionID">16</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">_sheet</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="652066156"/>
+                                       </object>
+                                       <int key="connectionID">17</int>
+                               </object>
+                       </object>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <object class="NSArray" key="orderedObjects">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">0</int>
+                                               <reference key="object" ref="0"/>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-2</int>
+                                               <reference key="object" ref="1001"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">File's Owner</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-1</int>
+                                               <reference key="object" ref="1003"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">First Responder</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-3</int>
+                                               <reference key="object" ref="1004"/>
+                                               <reference key="parent" ref="0"/>
+                                               <string key="objectName">Application</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1</int>
+                                               <reference key="object" ref="652066156"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="524609329"/>
+                                               </object>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">2</int>
+                                               <reference key="object" ref="524609329"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="868746641"/>
+                                                       <reference ref="957025783"/>
+                                                       <reference ref="63381136"/>
+                                                       <reference ref="360163659"/>
+                                                       <reference ref="1035583642"/>
+                                               </object>
+                                               <reference key="parent" ref="652066156"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">3</int>
+                                               <reference key="object" ref="63381136"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="202326148"/>
+                                               </object>
+                                               <reference key="parent" ref="524609329"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">4</int>
+                                               <reference key="object" ref="202326148"/>
+                                               <reference key="parent" ref="63381136"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">5</int>
+                                               <reference key="object" ref="360163659"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="262034013"/>
+                                               </object>
+                                               <reference key="parent" ref="524609329"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">6</int>
+                                               <reference key="object" ref="262034013"/>
+                                               <reference key="parent" ref="360163659"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">7</int>
+                                               <reference key="object" ref="1035583642"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="31432533"/>
+                                               </object>
+                                               <reference key="parent" ref="524609329"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">8</int>
+                                               <reference key="object" ref="31432533"/>
+                                               <reference key="parent" ref="1035583642"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">9</int>
+                                               <reference key="object" ref="868746641"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="17338870"/>
+                                               </object>
+                                               <reference key="parent" ref="524609329"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">10</int>
+                                               <reference key="object" ref="17338870"/>
+                                               <reference key="parent" ref="868746641"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">11</int>
+                                               <reference key="object" ref="957025783"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="693310967"/>
+                                               </object>
+                                               <reference key="parent" ref="524609329"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">12</int>
+                                               <reference key="object" ref="693310967"/>
+                                               <reference key="parent" ref="957025783"/>
+                                       </object>
+                               </object>
+                       </object>
+                       <object class="NSMutableDictionary" key="flattenedProperties">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <object class="NSArray" key="dict.sortedKeys">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                       <string>-1.IBPluginDependency</string>
+                                       <string>-2.IBPluginDependency</string>
+                                       <string>-3.IBPluginDependency</string>
+                                       <string>1.IBEditorWindowLastContentRect</string>
+                                       <string>1.IBPluginDependency</string>
+                                       <string>1.IBWindowTemplateEditedContentRect</string>
+                                       <string>1.NSWindowTemplate.visibleAtLaunch</string>
+                                       <string>10.IBPluginDependency</string>
+                                       <string>11.IBPluginDependency</string>
+                                       <string>12.IBPluginDependency</string>
+                                       <string>2.IBPluginDependency</string>
+                                       <string>3.IBPluginDependency</string>
+                                       <string>4.IBPluginDependency</string>
+                                       <string>5.IBPluginDependency</string>
+                                       <string>6.IBPluginDependency</string>
+                                       <string>7.IBPluginDependency</string>
+                                       <string>8.IBPluginDependency</string>
+                                       <string>9.IBPluginDependency</string>
+                               </object>
+                               <object class="NSMutableArray" key="dict.values">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{420, 582}, {298, 127}}</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{420, 582}, {298, 127}}</string>
+                                       <boolean value="NO"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               </object>
+                       </object>
+                       <object class="NSMutableDictionary" key="unlocalizedProperties">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <reference key="dict.sortedKeys" ref="0"/>
+                               <object class="NSMutableArray" key="dict.values">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                               </object>
+                       </object>
+                       <nil key="activeLocalization"/>
+                       <object class="NSMutableDictionary" key="localizations">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <reference key="dict.sortedKeys" ref="0"/>
+                               <object class="NSMutableArray" key="dict.values">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                               </object>
+                       </object>
+                       <nil key="sourceID"/>
+                       <int key="maxID">17</int>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes">
+                       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">ElisMovieSpeedController</string>
+                                       <string key="superclassName">NSObject</string>
+                                       <object class="NSMutableDictionary" key="actions">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>pushedCancel:</string>
+                                                       <string>pushedOK:</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                               </object>
+                                       </object>
+                                       <object class="NSMutableDictionary" key="outlets">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>_sheet</string>
+                                                       <string>_speedField</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>NSWindow</string>
+                                                       <string>NSTextField</string>
+                                               </object>
+                                       </object>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">ElisMovieSpeedController.h</string>
+                                       </object>
+                               </object>
+                       </object>
+                       <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSActionCell</string>
+                                       <string key="superclassName">NSCell</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSApplication</string>
+                                       <string key="superclassName">NSResponder</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="938576491">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSApplication</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="664689966">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSApplication</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="720901518">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSApplication</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSApplication</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSApplication</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSButton</string>
+                                       <string key="superclassName">NSControl</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSButtonCell</string>
+                                       <string key="superclassName">NSActionCell</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSCell</string>
+                                       <string key="superclassName">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSControl</string>
+                                       <string key="superclassName">NSView</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1044070112">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSFormatter</string>
+                                       <string key="superclassName">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSMenu</string>
+                                       <string key="superclassName">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="782090627">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <reference key="sourceIdentifier" ref="938576491"/>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <reference key="sourceIdentifier" ref="664689966"/>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <reference key="sourceIdentifier" ref="720901518"/>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <reference key="sourceIdentifier" ref="1044070112"/>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <reference key="sourceIdentifier" ref="782090627"/>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier" id="861028573">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">ImageKit.framework/Headers/IKImageBrowserView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">ImageKit.framework/Headers/IKSaveOptions.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">ImageKit.framework/Headers/ImageKitDeprecated.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">PDFKit.framework/Headers/PDFDocument.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">PDFKit.framework/Headers/PDFView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QTKit.framework/Headers/QTCaptureDecompressedAudioOutput.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QTKit.framework/Headers/QTCaptureDecompressedVideoOutput.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QTKit.framework/Headers/QTCaptureFileOutput.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QTKit.framework/Headers/QTCaptureVideoPreviewOutput.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QTKit.framework/Headers/QTCaptureView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QTKit.framework/Headers/QTMovie.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QTKit.framework/Headers/QTMovieView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QuartzComposer.framework/Headers/QCCompositionParameterView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QuartzComposer.framework/Headers/QCCompositionPickerView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QuartzFilters.framework/Headers/QuartzFilterManager.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">QuickLookUI.framework/Headers/QLPreviewPanel.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSPanel</string>
+                                       <string key="superclassName">NSWindow</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSPanel.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSResponder</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSResponder</string>
+                                       <string key="superclassName">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSTextField</string>
+                                       <string key="superclassName">NSControl</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSTextFieldCell</string>
+                                       <string key="superclassName">NSActionCell</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSView</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSView</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSView</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSView</string>
+                                       <string key="superclassName">NSResponder</string>
+                                       <reference key="sourceIdentifier" ref="861028573"/>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSWindow</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSWindow</string>
+                                       <string key="superclassName">NSResponder</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSWindow</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
+                                       </object>
+                               </object>
+                       </object>
+               </object>
+               <int key="IBDocument.localizationMode">0</int>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+                       <integer value="1060" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+                       <integer value="1060" key="NS.object.0"/>
+               </object>
+               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+                       <integer value="3000" key="NS.object.0"/>
+               </object>
+               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+               <string key="IBDocument.LastKnownRelativeProjectPath">../Elis Colors.xcodeproj</string>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+       </data>
+</archive>

diff --git a/README.rtf b/README.rtf
new file mode 100644 (file)
index 0000000..5b35d59
--- /dev/null
+++ b/README.rtf
@@ -0,0 +1,62 @@
+{\rtf1\ansi\ansicpg932\cocoartf1038\cocoasubrtf110
+{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;}
+{\colortbl;\red255\green255\blue255;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww13560\viewh11580\viewkind0
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
+
+\f0\b\fs36 \cf0 Elis Colors 0.1 \'82\'f0\'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'8b\'82\'b7\'82\'e9\'91\'4f\'82\'c9\'81\'41\'95\'4b\'82\'b8\'82\'b1\'82\'cc\'95\'b6\'8f\'91\'82\'f0\'82\'a8\'93\'c7\'82\'dd\'82\'ad\'82\'be\'82\'b3\'82\'a2\'81\'42
+\b0\fs24 \
+\
+\
+
+\b\fs38 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'8b\'82\'b7\'82\'e9\'91\'4f\'82\'c9
+\b0\fs24 \
+
+\fs28 Elis Colors 0.1 \'82\'cd\'83\'bf\'94\'c5\'82\'c5\'82\'b7\'81\'42\
+\'82\'b1\'82\'cc\'83\'6f\'81\'5b\'83\'57\'83\'87\'83\'93\'82\'cd\'88\'c0\'92\'e8\'93\'ae\'8d\'ec\'82\'b5\'82\'dc\'82\'b9\'82\'f1\'81\'42\'96\'a2\'8e\'c0\'91\'95\'82\'cc\'8b\'40\'94\'5c\'82\'c6\'83\'6f\'83\'4f\'82\'aa\'91\'bd\'90\'94\'91\'b6\'8d\'dd\'82\'b5\'82\'dc\'82\'b7\'81\'42\'83\'4e\'83\'89\'83\'62\'83\'56\'83\'85\'82\'b7\'82\'e9\'82\'b1\'82\'c6\'82\'e0\'82\'a0\'82\'e8\'82\'dc\'82\'b7\'81\'42\
+\'82\'b1\'82\'ea\'82\'e7\'82\'c9\'97\'af\'88\'d3\'82\'b5\'82\'c4\'8e\'c0\'8d\'73\'82\'b5\'82\'c4\'82\'ad\'82\'be\'82\'b3\'82\'a2\'81\'42
+\fs24 \
+\
+
+\b\fs38 \'83\'56\'83\'58\'83\'65\'83\'80\'97\'76\'8c\'8f
+\b0\fs24 \
+
+\fs28 Core Image \'91\'ce\'89\'9eGPU\'82\'c6Intel CPU\'82\'f0\'93\'8b\'8d\'da\'82\'b5\'82\'bdMac
+\fs24 \
+\
+
+\b\fs38 \'8e\'67\'82\'a2\'95\'fb
+\b0\fs24 \
+{\field{\*\fldinst{HYPERLINK "http://eliscolors.sourceforge.jp/tutorial.html"}}{\fldrslt 
+\fs28 http://eliscolors.sourceforge.jp/tutorial.html}}
+\fs28  \'82\'f0\'8e\'51\'8f\'c6\'82\'b5\'82\'c4\'82\'ad\'82\'be\'82\'b3\'82\'a2\'81\'42\
+\
+
+\b\fs38 \'8e\'67\'97\'70\'8a\'b4\'81\'45\'93\'ae\'8d\'ec\'95\'f1\'8d\'90
+\b0\fs24 \
+
+\fs28 Elis Colors\'82\'cd\'83\'bf\'94\'c5\'82\'cc\'8e\'67\'97\'70\'8a\'b4\'81\'45\'93\'ae\'8d\'ec\'95\'f1\'8d\'90\'81\'45\'90\'56\'8b\'40\'94\'5c\'82\'cc\'97\'76\'96\'5d\'81\'45\'83\'6f\'83\'4f\'8f\'43\'90\'b3\'83\'70\'83\'62\'83\'60\'82\'f0\'95\'e5\'8f\'57\'82\'b5\'82\'c4\'82\'a2\'82\'dc\'82\'b7\'81\'42
+\fs24 \
+
+\fs28 \'8f\'da\'8d\'d7\'82\'cd{\field{\*\fldinst{HYPERLINK "http://d.hatena.ne.jp/yanagia/20090929/1254227206"}}{\fldrslt http://d.hatena.ne.jp/yanagia/20090929/1254227206}}\'82\'f0\'8e\'51\'8f\'c6\'82\'b5\'82\'c4\'82\'ad\'82\'be\'82\'b3\'82\'a2\'81\'42
+\fs24 \
+\
+
+\b\fs38 \'83\'89\'83\'43\'83\'5a\'83\'93\'83\'58
+\b0\fs24 \
+
+\fs28 Elis Colors\'82\'cdzlib\'83\'89\'83\'43\'83\'5a\'83\'93\'83\'58\'82\'cc\'83\'49\'81\'5b\'83\'76\'83\'93\'83\'5c\'81\'5b\'83\'58\'81\'45\'83\'5c\'83\'74\'83\'67\'83\'45\'83\'46\'83\'41\'82\'c5\'82\'b7\'81\'42\
+\'82\'b1\'82\'cc\'83\'5c\'83\'74\'83\'67\'83\'45\'83\'46\'83\'41\'82\'cd\'96\'b3\'95\'db\'8f\'d8\'81\'45\'83\'6d\'83\'93\'83\'54\'83\'7c\'81\'5b\'83\'67\'82\'c5\'92\'f1\'8b\'9f\'82\'b3\'82\'ea\'82\'dc\'82\'b7\'81\'42
+\fs24 \
+\
+
+\b\fs38 \'90\'a7\'8d\'ec\'8e\'d2\'8f\'ee\'95\'f1
+\b0\fs24 \
+
+\fs28 \'90\'a7\'8d\'ec\'8e\'d2 : \'92\'a9\'91\'71 \'96\'f6 (id:yanagia)\
+\'83\'75\'83\'8d\'83\'4f : http://d.hatena.ne.jp/yanagia/\
+\
+\
+README.rtf version 0.1 (2009/09/29)
+\fs24 \
+}
\ No newline at end of file