From: Yanagi Asakura Date: Thu, 15 Oct 2009 14:09:13 +0000 (+0900) Subject: 0.2.1 X-Git-Url: http://git.osdn.net/view?p=eliscolors%2Fmain.git;a=commitdiff_plain;h=6631947582371ac84f99d514ef4def8c33b69eb5 0.2.1 --- diff --git a/Elis Colors.xcodeproj/project.pbxproj b/Elis Colors.xcodeproj/project.pbxproj index 4391703..b5de007 100644 --- a/Elis Colors.xcodeproj/project.pbxproj +++ b/Elis Colors.xcodeproj/project.pbxproj @@ -523,7 +523,7 @@ INFOPLIST_FILE = "Elis_Colors-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; PRODUCT_NAME = "Elis Colors"; - SDKROOT = macosx10.6; + SDKROOT = macosx10.5; VALID_ARCHS = "i386 x86_64"; }; name = "Release (Leopard)"; diff --git a/ElisBase.h b/ElisBase.h index 6f26642..268da20 100644 --- a/ElisBase.h +++ b/ElisBase.h @@ -27,8 +27,7 @@ // Copyright 2009 __MyCompanyName__. All rights reserved. // -// ElisからElis Colorsへ。 -// もっとかわいく。もっとエレガントに。 +// β1の前にちゃんとコード書き直す。 // 高速化の努力をするべきところ : // ElisController#timeSliderChanged @@ -40,7 +39,7 @@ // GCD使ったら表示がちらつくようになった。どういうことなの... -#define ELIS_VERSION @"0.2" +#define ELIS_VERSION @"0.2.1" //#define __SNOW_LEOPARD__ //#define __SNOW_LEOPARD_GCD__ diff --git a/ElisController.m b/ElisController.m index 23df417..1073753 100644 --- a/ElisController.m +++ b/ElisController.m @@ -150,16 +150,26 @@ static float convertQTTimeToSecond(QTTime t) [_tableController reload]; // GCD使ってみたら画面がちらつく。どういうことなの...？ + // [array addObject] ってどう見てもクリティカルセッションだった。 #ifdef __SNOW_LEOPARD_GCD__ + void** temp = malloc(sizeof(void*) * 128); + memset(temp, 0, sizeof(void*)*128); + dispatch_apply(size, diq, ^(size_t i) { ElisLayer* l = [layers objectAtIndex:i]; if([l isInclude:qttime]){ if(playing) [l play]; - [layerSet addObject:l]; +// [layerSet addObject:l]; + temp[i] = l; }else{ if(playing) [l stop]; } }); + + int i; + for(i = 0; i < 128; i++) + if(temp[i] != 0) [layerSet addObject:temp[i]]; + free(temp); #else // GCDなりOpenMPなりで並列化すること。 int i; diff --git a/ElisCustomFilter.h b/ElisCustomFilter.h index c2c365f..40eb412 100644 --- a/ElisCustomFilter.h +++ b/ElisCustomFilter.h @@ -29,7 +29,6 @@ // オレオレCore Imageフィルタ。 // Charlotte Filterって名前のパッケージにまとめるかも？ -// シャーロットです。画像系の低レベルな物事を引き受けてくれるスピード狂。prefixはCH // CHOpacity : 画像の透過度を変化させるフィルタ。 // inputOpacity=0.0-1.0 default=1.0 diff --git a/ElisEffect.m b/ElisEffect.m index a92af16..c23976e 100644 --- a/ElisEffect.m +++ b/ElisEffect.m @@ -219,6 +219,7 @@ [filter setValue:cm forKey:@"inputImage"]; } +// ここも並列化したい感じだわー。 - (CIImage*)getImage:(QTTime)time { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; diff --git a/ElisKeyframe.m b/ElisKeyframe.m index ddc6862..8fd05da 100644 --- a/ElisKeyframe.m +++ b/ElisKeyframe.m @@ -120,19 +120,19 @@ static float convertQTTimeToSecond(QTTime t) return cacheValue; } -//#ifdef __SNOW_LEOPARD_GCD__ -// dispatch_apply(size-1, diq, ^(size_t i) { -// if([[sortedTimes objectAtIndex:i] floatValue] <= now && -// now <= [[sortedTimes objectAtIndex:i+1] floatValue]){ -// cacheValue = (([[sortedTimes objectAtIndex:i+1] floatValue] - now) * -// [[timesAndValues objectForKey:[sortedTimes objectAtIndex:i]] floatValue] + -// (now - [[sortedTimes objectAtIndex:i] floatValue]) * -// [[timesAndValues objectForKey:[sortedTimes objectAtIndex:i+1]] floatValue]) / -// ([[sortedTimes objectAtIndex:i+1] floatValue] - [[sortedTimes objectAtIndex:i] floatValue]); -// } -// }); -// return cacheValue; -//#else +#ifdef __SNOW_LEOPARD_GCD__2 + dispatch_apply(size-1, diq, ^(size_t i) { + if([[sortedTimes objectAtIndex:i] floatValue] <= now && + now <= [[sortedTimes objectAtIndex:i+1] floatValue]){ + cacheValue = (([[sortedTimes objectAtIndex:i+1] floatValue] - now) * + [[timesAndValues objectForKey:[sortedTimes objectAtIndex:i]] floatValue] + + (now - [[sortedTimes objectAtIndex:i] floatValue]) * + [[timesAndValues objectForKey:[sortedTimes objectAtIndex:i+1]] floatValue]) / + ([[sortedTimes objectAtIndex:i+1] floatValue] - [[sortedTimes objectAtIndex:i] floatValue]); + } + }); + return cacheValue; +#else for(i = 0; i < size-1; i++){ if([[sortedTimes objectAtIndex:i] floatValue] <= now && now <= [[sortedTimes objectAtIndex:i+1] floatValue]){ @@ -144,7 +144,7 @@ static float convertQTTimeToSecond(QTTime t) return cacheValue; } } -//#endif +#endif return cacheValue; } diff --git a/ElisMainView.m b/ElisMainView.m index 0f7ddf6..50418dd 100644 --- a/ElisMainView.m +++ b/ElisMainView.m @@ -131,7 +131,7 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink, glClear(GL_COLOR_BUFFER_BIT); int i, size = [layerSet count]; - CIImage* ci; + CIImage* ci, *ci_tr; NSPoint point; CGRect imageRect; CGPoint cp; @@ -142,10 +142,17 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink, dx = (frame.size.width - ProjectMovieSize.size.width)/2; dy = (frame.size.height - ProjectMovieSize.size.height)/2; + void** transition = malloc(sizeof(void*) * TRACK_SIZE); + memset(transition, 0, sizeof(void*) * TRACK_SIZE); + // トラック番号順にバケットソート memset(sortedLayerSet, 0, sizeof(void*) * TRACK_SIZE); - for(i = 0; i < size; i++) - sortedLayerSet[[[layerSet objectAtIndex:i] trackNumber]] = [layerSet objectAtIndex:i]; + for(i = 0; i < size; i++){ + if(sortedLayerSet[[[layerSet objectAtIndex:i] trackNumber]] == 0) + sortedLayerSet[[[layerSet objectAtIndex:i] trackNumber]] = [layerSet objectAtIndex:i]; + else + transition[[[layerSet objectAtIndex:i] trackNumber]] = [layerSet objectAtIndex:i]; + } for(i = 0; i < TRACK_SIZE; i++){ if(sortedLayerSet[i] == 0) continue; @@ -154,6 +161,15 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink, point = [sortedLayerSet[i] getPositionForTime:[sortedLayerSet[i] convertToInnnerTime:time]]; originSize = [sortedLayerSet[i] originSize]; if(ci == nil) continue; // サウンドレイヤーはスキップ + if(transition[i] != 0){ +// ci_tr = [transition[i] getEffectedImageWithoutStamp:time]; +// CIFilter* tr = [CIFilter filterWithName:@"CIDissolveTransition"]; +// [tr setDefaults]; +// [tr setValue:ci forKey:@"inputImage"]; +// [tr setValue:ci_tr forKey:@"inputTargetImage"]; +// [tr setValue:[NSNumber numberWithFloat:0.5] forKey:@"inputTime"]; +// ci = [tr valueForKey:@"outputImage"]; + } imageRect = [ci extent]; if(imageRect.size.width >= 4000){ imageRect = CGRectMake(0.0, 0.0, 4000, 3000); @@ -184,6 +200,8 @@ static CVReturn MyRenderCallback(CVDisplayLinkRef displayLink, glFlush(); + free(transition); + // あとかたづけ for(i = 0; i < size; i++) [[layerSet objectAtIndex:i] releaseContext]; diff --git a/ElisMediaBrowserController.m b/ElisMediaBrowserController.m index aafea23..c78196e 100644 --- a/ElisMediaBrowserController.m +++ b/ElisMediaBrowserController.m @@ -170,6 +170,8 @@ static NSArray *openFiles() conformsToType:@"public.image"]) { /* add a path to our temporary array */ + CIImage* ci = [CIImage imageWithContentsOfURL:[NSURL fileURLWithPath:path]]; + if(ci == nil) return; p = [[myImageObject alloc] init]; [p setPath:path]; [_importedImages addObject:p]; diff --git a/Elis_Colors-Info.plist b/Elis_Colors-Info.plist index 3e5c73c..53b5af3 100644 --- a/Elis_Colors-Info.plist +++ b/Elis_Colors-Info.plist @@ -21,7 +21,7 @@ CFBundleShortVersionString 0.2 LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} + 10.5 CFBundleVersion alpha2 NSMainNibFile diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index dbcf5d8..987c04a 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -22,7 +22,7 @@ YES - + YES @@ -1418,888 +1418,949 @@ 256 YES - + - 303 - {{932, 376}, {109, 25}} - - YES - - 67239424 - 134217728 - Play - - LucidaGrande - 13 - 1044 - - - 914637055 - 163 - - - 400 - 75 - - - - - 302 - {{18, 374}, {675, 21}} - - YES - - -2079981824 - 0 - - - 1 - 0.0 - 0.0 - 0.0 - 0 - 1 - NO - NO - - - - - 303 - {{710, 383}, {182, 17}} - - YES - - 68288064 - 272630784 - Time Code - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 314 + 286 YES - - - 2304 + + + 256 YES - - - 256 - {1209, 332} - - ElisTimeLineView - - - {{2, 2}, {1223, 331}} - - - - - 6 - - - - 256 - {{1225, 2}, {15, 331}} - - YES - - _doScroller: - 1 - 0.99698795180722888 - - - - 256 - {{2, 333}, {1223, 15}} - - 1 - - _doScroller: - 0.99917287014061207 - - - {{19, 20}, {1242, 350}} - - - 115 - - - - - - - 27 - {{706, 398}, {562, 515}} - - - YES - - 2 - - - 256 - - YES - - - 289 - {{398, 17}, {129, 25}} - - YES - - -2079981824 - 0 - - - 1 - 0.10000000000000001 - 0.40000000000000002 - 0.0 - 10 - 0 - YES - NO - - - - - 306 - - YES - - - 2304 - - YES - - - 18 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - NSFilenamesPboardType - NSTypedFilenamesPboardType:'.SGI' - NSTypedFilenamesPboardType:'8BPS' - NSTypedFilenamesPboardType:'BMP ' - NSTypedFilenamesPboardType:'BMPf' - NSTypedFilenamesPboardType:'EPSF' - NSTypedFilenamesPboardType:'FPix' - NSTypedFilenamesPboardType:'GIFf' - NSTypedFilenamesPboardType:'ICO ' - NSTypedFilenamesPboardType:'JPEG' - NSTypedFilenamesPboardType:'PDF ' - NSTypedFilenamesPboardType:'PICT' - NSTypedFilenamesPboardType:'PNGf' - NSTypedFilenamesPboardType:'PNTG' - NSTypedFilenamesPboardType:'TIFF' - NSTypedFilenamesPboardType:'TPIC' - NSTypedFilenamesPboardType:'icns' - NSTypedFilenamesPboardType:'jp2 ' - NSTypedFilenamesPboardType:'qtif' - NSTypedFilenamesPboardType:3FR - NSTypedFilenamesPboardType:3fr - NSTypedFilenamesPboardType:ARW - NSTypedFilenamesPboardType:BMP - NSTypedFilenamesPboardType:CR2 - NSTypedFilenamesPboardType:CRW - NSTypedFilenamesPboardType:CUR - NSTypedFilenamesPboardType:DCR - NSTypedFilenamesPboardType:DNG - NSTypedFilenamesPboardType:EFX - NSTypedFilenamesPboardType:EPI - NSTypedFilenamesPboardType:EPS - NSTypedFilenamesPboardType:EPSF - NSTypedFilenamesPboardType:EPSI - NSTypedFilenamesPboardType:ERF - NSTypedFilenamesPboardType:EXR - NSTypedFilenamesPboardType:FAX - NSTypedFilenamesPboardType:FFF - NSTypedFilenamesPboardType:FPIX - NSTypedFilenamesPboardType:FPX - NSTypedFilenamesPboardType:G3 - NSTypedFilenamesPboardType:GIF - NSTypedFilenamesPboardType:HDR - NSTypedFilenamesPboardType:ICNS - NSTypedFilenamesPboardType:ICO - NSTypedFilenamesPboardType:JFAX - NSTypedFilenamesPboardType:JFX - NSTypedFilenamesPboardType:JP2 - NSTypedFilenamesPboardType:JPE - NSTypedFilenamesPboardType:JPEG - NSTypedFilenamesPboardType:JPF - NSTypedFilenamesPboardType:JPG - NSTypedFilenamesPboardType:MAC - NSTypedFilenamesPboardType:MOS - NSTypedFilenamesPboardType:MRW - NSTypedFilenamesPboardType:NEF - NSTypedFilenamesPboardType:NRW - NSTypedFilenamesPboardType:ORF - NSTypedFilenamesPboardType:PCT - NSTypedFilenamesPboardType:PDF - NSTypedFilenamesPboardType:PEF - NSTypedFilenamesPboardType:PIC - NSTypedFilenamesPboardType:PICT - NSTypedFilenamesPboardType:PNG - NSTypedFilenamesPboardType:PNT - NSTypedFilenamesPboardType:PNTG - NSTypedFilenamesPboardType:PS - NSTypedFilenamesPboardType:PSD - NSTypedFilenamesPboardType:PWL - NSTypedFilenamesPboardType:QTI - NSTypedFilenamesPboardType:QTIF - NSTypedFilenamesPboardType:RAF - NSTypedFilenamesPboardType:RAW - NSTypedFilenamesPboardType:RGB - NSTypedFilenamesPboardType:RW2 - NSTypedFilenamesPboardType:RWL - NSTypedFilenamesPboardType:SGI - NSTypedFilenamesPboardType:SR2 - NSTypedFilenamesPboardType:SRF - NSTypedFilenamesPboardType:TARGA - NSTypedFilenamesPboardType:TGA - NSTypedFilenamesPboardType:TIF - NSTypedFilenamesPboardType:TIFF - NSTypedFilenamesPboardType:XBM - NSTypedFilenamesPboardType:arw - NSTypedFilenamesPboardType:bmp - NSTypedFilenamesPboardType:cr2 - NSTypedFilenamesPboardType:crw - NSTypedFilenamesPboardType:cur - NSTypedFilenamesPboardType:dcr - NSTypedFilenamesPboardType:dng - NSTypedFilenamesPboardType:efx - NSTypedFilenamesPboardType:epi - NSTypedFilenamesPboardType:eps - NSTypedFilenamesPboardType:epsf - NSTypedFilenamesPboardType:epsi - NSTypedFilenamesPboardType:erf - NSTypedFilenamesPboardType:exr - NSTypedFilenamesPboardType:fax - NSTypedFilenamesPboardType:fff - NSTypedFilenamesPboardType:fpix - NSTypedFilenamesPboardType:fpx - NSTypedFilenamesPboardType:g3 - NSTypedFilenamesPboardType:gif - NSTypedFilenamesPboardType:hdr - NSTypedFilenamesPboardType:icns - NSTypedFilenamesPboardType:ico - NSTypedFilenamesPboardType:jfax - NSTypedFilenamesPboardType:jfx - NSTypedFilenamesPboardType:jp2 - NSTypedFilenamesPboardType:jpe - NSTypedFilenamesPboardType:jpeg - NSTypedFilenamesPboardType:jpf - NSTypedFilenamesPboardType:jpg - NSTypedFilenamesPboardType:mac - NSTypedFilenamesPboardType:mos - NSTypedFilenamesPboardType:mrw - NSTypedFilenamesPboardType:nef - NSTypedFilenamesPboardType:nrw - NSTypedFilenamesPboardType:orf - NSTypedFilenamesPboardType:pct - NSTypedFilenamesPboardType:pdf - NSTypedFilenamesPboardType:pef - NSTypedFilenamesPboardType:pic - NSTypedFilenamesPboardType:pict - NSTypedFilenamesPboardType:png - NSTypedFilenamesPboardType:pnt - NSTypedFilenamesPboardType:pntg - NSTypedFilenamesPboardType:ps - NSTypedFilenamesPboardType:psd - NSTypedFilenamesPboardType:pwl - NSTypedFilenamesPboardType:qti - NSTypedFilenamesPboardType:qtif - NSTypedFilenamesPboardType:raf - NSTypedFilenamesPboardType:raw - NSTypedFilenamesPboardType:rgb - NSTypedFilenamesPboardType:rw2 - NSTypedFilenamesPboardType:rwl - NSTypedFilenamesPboardType:sgi - NSTypedFilenamesPboardType:sr2 - NSTypedFilenamesPboardType:srf - NSTypedFilenamesPboardType:targa - NSTypedFilenamesPboardType:tga - NSTypedFilenamesPboardType:tif - NSTypedFilenamesPboardType:tiff - NSTypedFilenamesPboardType:xbm - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - + + + 286 + + YES + + + 256 + + YES + + + 303 + {{-2, 8}, {686, 21}} + + YES + + -2079981824 + 0 + + + 1 + 0.0 + 0.0 + 0.0 + 0 + 1 + NO + NO + + + + + 1310 + + {{0, 35}, {682, 499}} + + + + AAAAYAAAAAA - {531, 415} - - NO - NO - YES - NO - YES - NO - NO - YES - 96 - 96 - - - {{1, 1}, {531, 415}} - - - - - 6 - - - - 256 - {{532, 1}, {15, 415}} - - - _doScroller: - 1 - 0.96363627910614014 - - - - -2147483392 - {{-100, -100}, {318, 15}} - - 1 - - _doScroller: - 0.50602412223815918 + {690, 535} + + NSView - {{-3, 49}, {548, 417}} - - - 18 - - - - QSAAAEEgAABC8gAAQwgAAA - - - {{10, 33}, {542, 469}} - - - Media Browser - - - - - Item 2 - - - 256 - - YES - - - 306 - - YES - - - 2304 - - YES - - - 2322 - {491, 14} - - - - - - - - - - - YES - - - 134 - + + + 256 + + YES + + + 303 + {{239, 3}, {109, 25}} + + YES + + 67239424 + 134217728 + Play + + LucidaGrande + 13 + 1044 + + + 914637055 + 163 + + + 400 + 75 + + + + + 301 + {{356, 3}, {40, 25}} + + YES + + -2080244224 + 134217728 + >> + + + -2038152961 + 163 + + + 400 + 75 + + + + + 301 + {{191, 3}, {40, 25}} + + YES + + -2080244224 + 134217728 + << + + + -2038152961 + 163 + + + 400 + 75 + + + + + 303 + {{17, 10}, {182, 17}} + + YES + + 68288064 + 272630784 + Time Code + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA - - 491 - 1 - - 12135 - 0 - - - 1 - MC43OTg5MTMwNDM1IDAuNzk4OTEzMDQzNSAwLjc5ODkxMzA0MzUAA + + 6 + System + controlTextColor + + 3 + MAA - - YES - - YES - NSBackgroundColor - NSColor - - + + + + + + 27 + {{2, 25}, {554, 512}} + + + YES + + 2 + + + 256 + YES - - 6 - System - selectedTextBackgroundColor - + + + 289 + {{390, -3}, {129, 25}} + + YES + + -2079981824 + 0 + + + 1 + 0.10000000000000001 + 0.40000000000000002 + 0.0 + 10 + 0 + YES + NO + - - 6 - System - selectedTextColor - + + + 306 + + YES + + + 2304 + + YES + + + 18 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + Apple URL pasteboard type + NSFilenamesPboardType + NSTypedFilenamesPboardType:'.SGI' + NSTypedFilenamesPboardType:'8BPS' + NSTypedFilenamesPboardType:'BMP ' + NSTypedFilenamesPboardType:'BMPf' + NSTypedFilenamesPboardType:'EPSF' + NSTypedFilenamesPboardType:'FPix' + NSTypedFilenamesPboardType:'GIFf' + NSTypedFilenamesPboardType:'ICO ' + NSTypedFilenamesPboardType:'JPEG' + NSTypedFilenamesPboardType:'PDF ' + NSTypedFilenamesPboardType:'PICT' + NSTypedFilenamesPboardType:'PNGf' + NSTypedFilenamesPboardType:'PNTG' + NSTypedFilenamesPboardType:'TIFF' + NSTypedFilenamesPboardType:'TPIC' + NSTypedFilenamesPboardType:'icns' + NSTypedFilenamesPboardType:'jp2 ' + NSTypedFilenamesPboardType:'qtif' + NSTypedFilenamesPboardType:3FR + NSTypedFilenamesPboardType:3fr + NSTypedFilenamesPboardType:ARW + NSTypedFilenamesPboardType:BMP + NSTypedFilenamesPboardType:CR2 + NSTypedFilenamesPboardType:CRW + NSTypedFilenamesPboardType:CUR + NSTypedFilenamesPboardType:DCR + NSTypedFilenamesPboardType:DNG + NSTypedFilenamesPboardType:EFX + NSTypedFilenamesPboardType:EPI + NSTypedFilenamesPboardType:EPS + NSTypedFilenamesPboardType:EPSF + NSTypedFilenamesPboardType:EPSI + NSTypedFilenamesPboardType:ERF + NSTypedFilenamesPboardType:EXR + NSTypedFilenamesPboardType:FAX + NSTypedFilenamesPboardType:FFF + NSTypedFilenamesPboardType:FPIX + NSTypedFilenamesPboardType:FPX + NSTypedFilenamesPboardType:G3 + NSTypedFilenamesPboardType:GIF + NSTypedFilenamesPboardType:HDR + NSTypedFilenamesPboardType:ICNS + NSTypedFilenamesPboardType:ICO + NSTypedFilenamesPboardType:JFAX + NSTypedFilenamesPboardType:JFX + NSTypedFilenamesPboardType:JP2 + NSTypedFilenamesPboardType:JPE + NSTypedFilenamesPboardType:JPEG + NSTypedFilenamesPboardType:JPF + NSTypedFilenamesPboardType:JPG + NSTypedFilenamesPboardType:MAC + NSTypedFilenamesPboardType:MOS + NSTypedFilenamesPboardType:MRW + NSTypedFilenamesPboardType:NEF + NSTypedFilenamesPboardType:NRW + NSTypedFilenamesPboardType:ORF + NSTypedFilenamesPboardType:PCT + NSTypedFilenamesPboardType:PDF + NSTypedFilenamesPboardType:PEF + NSTypedFilenamesPboardType:PIC + NSTypedFilenamesPboardType:PICT + NSTypedFilenamesPboardType:PNG + NSTypedFilenamesPboardType:PNT + NSTypedFilenamesPboardType:PNTG + NSTypedFilenamesPboardType:PS + NSTypedFilenamesPboardType:PSD + NSTypedFilenamesPboardType:PWL + NSTypedFilenamesPboardType:QTI + NSTypedFilenamesPboardType:QTIF + NSTypedFilenamesPboardType:RAF + NSTypedFilenamesPboardType:RAW + NSTypedFilenamesPboardType:RGB + NSTypedFilenamesPboardType:RW2 + NSTypedFilenamesPboardType:RWL + NSTypedFilenamesPboardType:SGI + NSTypedFilenamesPboardType:SR2 + NSTypedFilenamesPboardType:SRF + NSTypedFilenamesPboardType:TARGA + NSTypedFilenamesPboardType:TGA + NSTypedFilenamesPboardType:TIF + NSTypedFilenamesPboardType:TIFF + NSTypedFilenamesPboardType:XBM + NSTypedFilenamesPboardType:arw + NSTypedFilenamesPboardType:bmp + NSTypedFilenamesPboardType:cr2 + NSTypedFilenamesPboardType:crw + NSTypedFilenamesPboardType:cur + NSTypedFilenamesPboardType:dcr + NSTypedFilenamesPboardType:dng + NSTypedFilenamesPboardType:efx + NSTypedFilenamesPboardType:epi + NSTypedFilenamesPboardType:eps + NSTypedFilenamesPboardType:epsf + NSTypedFilenamesPboardType:epsi + NSTypedFilenamesPboardType:erf + NSTypedFilenamesPboardType:exr + NSTypedFilenamesPboardType:fax + NSTypedFilenamesPboardType:fff + NSTypedFilenamesPboardType:fpix + NSTypedFilenamesPboardType:fpx + NSTypedFilenamesPboardType:g3 + NSTypedFilenamesPboardType:gif + NSTypedFilenamesPboardType:hdr + NSTypedFilenamesPboardType:icns + NSTypedFilenamesPboardType:ico + NSTypedFilenamesPboardType:jfax + NSTypedFilenamesPboardType:jfx + NSTypedFilenamesPboardType:jp2 + NSTypedFilenamesPboardType:jpe + NSTypedFilenamesPboardType:jpeg + NSTypedFilenamesPboardType:jpf + NSTypedFilenamesPboardType:jpg + NSTypedFilenamesPboardType:mac + NSTypedFilenamesPboardType:mos + NSTypedFilenamesPboardType:mrw + NSTypedFilenamesPboardType:nef + NSTypedFilenamesPboardType:nrw + NSTypedFilenamesPboardType:orf + NSTypedFilenamesPboardType:pct + NSTypedFilenamesPboardType:pdf + NSTypedFilenamesPboardType:pef + NSTypedFilenamesPboardType:pic + NSTypedFilenamesPboardType:pict + NSTypedFilenamesPboardType:png + NSTypedFilenamesPboardType:pnt + NSTypedFilenamesPboardType:pntg + NSTypedFilenamesPboardType:ps + NSTypedFilenamesPboardType:psd + NSTypedFilenamesPboardType:pwl + NSTypedFilenamesPboardType:qti + NSTypedFilenamesPboardType:qtif + NSTypedFilenamesPboardType:raf + NSTypedFilenamesPboardType:raw + NSTypedFilenamesPboardType:rgb + NSTypedFilenamesPboardType:rw2 + NSTypedFilenamesPboardType:rwl + NSTypedFilenamesPboardType:sgi + NSTypedFilenamesPboardType:sr2 + NSTypedFilenamesPboardType:srf + NSTypedFilenamesPboardType:targa + NSTypedFilenamesPboardType:tga + NSTypedFilenamesPboardType:tif + NSTypedFilenamesPboardType:tiff + NSTypedFilenamesPboardType:xbm + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {523, 439} + + NO + NO + YES + NO + YES + NO + NO + YES + 96 + 96 + + + + + {{1, 1}, {523, 439}} + + + + + 6 + + + + 256 + {{524, 1}, {15, 439}} + + + _doScroller: + 1 + 0.96363627910614014 + + + + -2147483392 + {{-100, -100}, {318, 15}} + + 1 + + _doScroller: + 0.50602412223815918 + + + {{-3, 29}, {540, 441}} + + + 18 + + + + QSAAAEEgAABC8gAAQwgAAA + {{10, 33}, {534, 466}} + - - - YES - + Media Browser + + + + + Item 2 + + + 256 + YES - NSColor - NSCursor - NSUnderline + + + 306 + + YES + + + 2304 + + YES + + + 2322 + {479, 14} + + + + + + + + + + + YES + + + 134 + + + + 479 + 1 + + + 12135 + 0 + + + 1 + MC43OTg5MTMwNDM1IDAuNzk4OTEzMDQzNSAwLjc5ODkxMzA0MzUAA + + + YES + + YES + NSBackgroundColor + NSColor + + + YES + + 6 + System + selectedTextBackgroundColor + + + + 6 + System + selectedTextColor + + + + + + + YES + + YES + NSColor + NSCursor + NSUnderline + + + YES + + 1 + MCAwIDEAA + + + {8, -8} + 13 + + + + + + + 6 + {999, 1e+07} + {223, 0} + + + + {{1, 1}, {479, 447}} + + + + + 3 + MQA + + + {4, -5} + 1 + + 4 + + + + 256 + {{480, 1}, {15, 447}} + + + _doScroller: + 0.99248120300751874 + + + + -2147483392 + {{-100, -100}, {87, 18}} + + 1 + + _doScroller: + 1 + 0.94565218687057495 + + + {{21, 21}, {496, 449}} + + + 18 + + + + - + {{10, 33}, {534, 466}} + + Text + + + + + 1 + + + 256 + YES - - 1 - MCAwIDEAA + + + 282 + + YES + + + 2304 + + YES + + + 256 + {534, 399} + + YES + + + 256 + {534, 17} + + + + + + -2147483392 + {{492, 0}, {16, 17}} + + + + YES + + name + 252 + 40 + 1000 + + 75628096 + 2048 + + + LucidaGrande + 11 + 3100 + + + 3 + MC4zMzMzMzI5ODU2AA + + + 6 + System + headerTextColor + + + + + 337772096 + 2048 + Text Cell + + + + 6 + System + controlBackgroundColor + + + + + 3 + YES + + + + number + 64 + 40 + 1000 + + 75628096 + 2048 + + + + + + + 337772096 + 2048 + Text Cell + + + + + + 3 + YES + YES + + + + slider + 209 + 10 + 3.4028234663852886e+38 + + 75628096 + 2048 + + + + 6 + System + headerColor + + + + + + -2079981824 + 0 + + + 1 + 0.0 + 1 + 0.0 + 0 + 1 + NO + NO + + 3 + YES + YES + + + + 3 + 2 + + + 6 + System + gridColor + + 3 + MC41AA + + + 17 + -700448768 + + + 4 + 15 + 0 + YES + 0 + + + {{1, 17}, {534, 399}} + + + + + 4 + + + + -2147483392 + {{492, 17}, {15, 281}} + + + _doScroller: + 0.94932432432432434 + + + + -2147483392 + {{1, 298}, {506, 15}} + + 1 + + _doScroller: + 1 + 0.70967741935483875 + + + + 2304 + + YES + + + {{1, 0}, {534, 17}} + + + + + 4 + + + + {{1, 53}, {536, 417}} + + + 562 + + + + + + QSAAAEEgAABBmAAAQZgAAA - - {8, -8} - 13 + + + 292 + {{21, 19}, {155, 25}} + + YES + + 67239424 + 134217728 + Recording Animation + + + 914637055 + 163 + + + 400 + 75 + + + + + 289 + {{369, 19}, {148, 25}} + + YES + + -2080244224 + 134217728 + Delete Animation + + + -2038152961 + 163 + + + 400 + 75 + - + {{10, 33}, {534, 466}} - + Property + + - 6 - {999, 1e+07} - {223, 0} - + + + + 0 + YES + YES + + YES + - {{1, 1}, {491, 447}} - - - - - 3 - MQA - - - {4, -5} - 1 - - 4 - - - - 256 - {{492, 1}, {15, 447}} - - - _doScroller: - 0.99248120300751874 - - - - -2147483392 - {{-100, -100}, {87, 18}} - - 1 - - _doScroller: - 1 - 0.94565218687057495 + {{691, 0}, {551, 535}} + + NSView - {{17, 17}, {508, 449}} - - - 18 - - - + {1242, 535} + + YES + 2 - {{10, 33}, {542, 469}} - Text - - + {1241, 538} + + NSView - - 1 - - - 256 - - YES - - - 282 - - YES - - - 2304 - - YES - - - 256 - {546, 399} - - YES - - - 256 - {546, 17} - - - - - - -2147483392 - {{492, 0}, {16, 17}} - - - - YES - - name - 252 - 40 - 1000 - - 75628096 - 2048 - - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 337772096 - 2048 - Text Cell - - - - 6 - System - controlBackgroundColor - - - - - 3 - YES - - - - number - 64 - 40 - 1000 - - 75628096 - 2048 - - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - slider - 221 - 10 - 3.4028234663852886e+38 - - 75628096 - 2048 - - - - 6 - System - headerColor - - - - - - -2079981824 - 0 - - - 1 - 0.0 - 1 - 0.0 - 0 - 1 - NO - NO - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - -700448768 - - - 4 - 15 - 0 - YES - 0 - - - {{1, 17}, {546, 399}} - - - - - 4 - - - - -2147483392 - {{492, 17}, {15, 281}} - - - _doScroller: - 0.94932432432432434 - - - - -2147483392 - {{1, 298}, {506, 15}} - - 1 - - _doScroller: - 1 - 0.70967741935483875 - - - - 2304 - - YES - + + + 256 + + YES + + + 314 + + YES + + + 2304 + + YES + + + 256 + {1209, 332} + + ElisTimeLineView - {{1, 0}, {546, 17}} - - - - - 4 - + {{2, 2}, {1223, 325}} + + + + + 6 - {{-3, 49}, {548, 417}} - - - 562 - - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 292 - {{17, 15}, {155, 25}} - - YES - - 67239424 - 134217728 - Recording Animation - - - 914637055 - 163 - - - 400 - 75 + + + 256 + {{1225, 2}, {15, 325}} + + YES + + _doScroller: + 1 + 0.97891566265060237 - - - - 289 - {{377, 15}, {148, 25}} - - YES - - -2080244224 - 134217728 - Delete Animation - - - -2038152961 - 163 - - - 400 - 75 + + + 256 + {{2, 327}, {1223, 15}} + + 1 + + _doScroller: + 0.99917287014061207 + {{-1, 4}, {1242, 344}} + + + 115 + + + - {{10, 33}, {542, 469}} - Property - - + {{0, 539}, {1241, 348}} + + NSView - - - 0 - YES - YES - - YES - - - - - - 1310 - - {{19, 407}, {672, 500}} - - - - AAAAYAAAAAA - - - - - - 301 - {{884, 376}, {40, 25}} - - YES - - -2080244224 - 134217728 - << - - - -2038152961 - 163 - - - 400 - 75 - - - - - 301 - {{1049, 376}, {40, 25}} + {{20, 20}, {1241, 887}} - YES - - -2080244224 - 134217728 - >> - - - -2038152961 - 163 - - - 400 - 75 - + 2 {1281, 927} @@ -3957,14 +4018,7 @@ YES - - - - - - - - + @@ -4465,46 +4519,97 @@ - 542 - - - YES - - - + 564 + + - 543 - - + 597 + + - 548 - + 600 + + + + + 621 + + + + + 630 + + + + + 654 + + + + + 687 + + + + + 689 + + + + + 690 + + + + + 692 + + + + + 704 + + + + + 706 + + + + + 707 + + + + + 732 + YES - + + - 549 - - - - - 550 - + 733 + YES - + - + - 551 - - + 734 + + + YES + + + 560 @@ -4515,7 +4620,7 @@ - + 561 @@ -4533,92 +4638,142 @@ - 564 - - + 724 + + + YES + + + + + + + 726 + + + YES + + + + + + + 586 YES - - + + - + - 587 - + 668 + YES - + - 588 - - + 669 + + YES - - - + - + - 589 - + 679 + YES - + + + + + + + + 682 + + + + + 681 + + + + + 680 + + + + + 587 + + + YES + - 590 - + 588 + YES - - + + + - + - 565 - + 593 + YES - - - - + - 569 - - + 594 + + - 568 - + 591 + YES - - - + - + - 567 - - + 592 + + + + + 565 + + + YES + + + + + + 566 @@ -4626,22 +4781,20 @@ - 578 - - - YES - - - + 567 + + - 571 - + 568 + YES - + + + - + 570 @@ -4658,52 +4811,56 @@ + 571 + + + YES + + + + + 572 + 578 + + + YES + + + + + 580 - 591 - + 569 + + + + + 589 + YES - + - - - - 592 - - + - 593 - + 590 + YES - + + - - - - 594 - - - - - 597 - - - - - 600 - - + 602 @@ -4724,15 +4881,15 @@ YES - - + + - 610 - + 601 + @@ -4741,93 +4898,52 @@ - 601 - + 610 + - 621 - - - - - 630 - - + 725 + + + YES + + + + 533 - + - 654 - - - - - 668 - + 548 + YES - + - + - 669 - - - YES - - - + 549 + + - 679 - + 550 + YES - - - + - - - - 680 - - - - - 681 - - - - - 682 - - - - - 687 - - + - 689 - - - - - 690 - - - - - 692 - - + 551 + + 696 @@ -4836,7 +4952,7 @@ YES - + 697 @@ -4850,7 +4966,7 @@ YES - + 699 @@ -4858,19 +4974,18 @@ - 704 - - - - - 706 - - + 542 + + + YES + + + - 707 - - + 543 + + @@ -5169,8 +5284,14 @@ 707.IBPluginDependency 72.IBPluginDependency 72.ImportedFromIB2 + 724.IBPluginDependency + 725.IBPluginDependency + 726.IBPluginDependency 73.IBPluginDependency 73.ImportedFromIB2 + 732.IBPluginDependency + 733.IBPluginDependency + 734.IBPluginDependency 74.IBPluginDependency 74.ImportedFromIB2 75.IBPluginDependency @@ -5326,9 +5447,9 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{7, 203}, {1281, 927}} + {{33, 197}, {1281, 927}} com.apple.InterfaceBuilder.CocoaPlugin - {{7, 203}, {1281, 927}} + {{33, 197}, {1281, 927}} {{33, 99}, {480, 360}} @@ -5495,8 +5616,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5536,7 +5663,7 @@ - 711 + 744 @@ -6475,6 +6602,14 @@ + NSSplitView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSSplitView.h + + + NSTabView NSView diff --git a/README.rtf b/README.rtf index 5b35d59..3eb2292 100644 --- a/README.rtf +++ b/README.rtf @@ -4,7 +4,7 @@ \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 +\f0\b\fs36 \cf0 Elis Colors 0.2 \'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 \ \ \ @@ -12,7 +12,7 @@ \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\ +\fs28 Elis Colors 0.2 \'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 \ @@ -57,6 +57,6 @@ \'83\'75\'83\'8d\'83\'4f : http://d.hatena.ne.jp/yanagia/\ \ \ -README.rtf version 0.1 (2009/09/29) +README.rtf version 0.2 (2009/10/04) \fs24 \ } \ No newline at end of file