Bring up to date

This commit is contained in:
Matthias Neeracher 2016-08-13 21:17:38 +02:00
parent d438c0a961
commit 0fb5718725
6 changed files with 2801 additions and 1571 deletions

BIN
Artwork/.DS_Store vendored

Binary file not shown.

View File

@ -282,7 +282,7 @@
950BB65D13F1F26200D8E669 /* Project object */ = { 950BB65D13F1F26200D8E669 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0410; LastUpgradeCheck = 0800;
ORGANIZATIONNAME = "Matthias Neeracher"; ORGANIZATIONNAME = "Matthias Neeracher";
}; };
buildConfigurationList = 950BB66013F1F26200D8E669 /* Build configuration list for PBXProject "Medianno" */; buildConfigurationList = 950BB66013F1F26200D8E669 /* Build configuration list for PBXProject "Medianno" */;
@ -434,11 +434,22 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1", "DEBUG=1",
@ -449,10 +460,13 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET = 10.10;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx10.7; SDKROOT = macosx;
}; };
name = Debug; name = Debug;
}; };
@ -460,18 +474,31 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET = 10.10;
SDKROOT = macosx10.7; SDKROOT = macosx;
}; };
name = Release; name = Release;
}; };
@ -483,6 +510,7 @@
GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch"; GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch";
INFOPLIST_FILE = "Medianno/Medianno-Info.plist"; INFOPLIST_FILE = "Medianno/Medianno-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_BUNDLE_IDENTIFIER = "org.aereperennius.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx; SDKROOT = macosx;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
@ -497,6 +525,7 @@
GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch"; GCC_PREFIX_HEADER = "Medianno/Medianno-Prefix.pch";
INFOPLIST_FILE = "Medianno/Medianno-Info.plist"; INFOPLIST_FILE = "Medianno/Medianno-Info.plist";
MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_BUNDLE_IDENTIFIER = "org.aereperennius.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx; SDKROOT = macosx;
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;

View File

@ -20,6 +20,8 @@
#import "MAAppController.h" #import "MAAppController.h"
#import "MADragging.h" #import "MADragging.h"
#include <algorithm>
static const char * kMADocWindowObserver = "MADocWindowObserver"; static const char * kMADocWindowObserver = "MADocWindowObserver";
@implementation MADocWindow @implementation MADocWindow
@ -56,12 +58,12 @@ static const char * kMADocWindowObserver = "MADocWindowObserver";
- (MAMovieWindow *)moviePanel - (MAMovieWindow *)moviePanel
{ {
return [[NSApp delegate] moviePanel]; return [(MAAppController *)[NSApp delegate] moviePanel];
} }
- (MATagWindow *)tagPanel - (MATagWindow *)tagPanel
{ {
return [[NSApp delegate] tagPanel]; return [(MAAppController *)[NSApp delegate] tagPanel];
} }
- (void)moviePanelDidAppear - (void)moviePanelDidAppear
@ -323,7 +325,7 @@ static NSTimeInterval sLastSkip = 0.0;
- (void)skipTimeInterval - (void)skipTimeInterval
{ {
QTTime interval = QTMakeTimeWithTimeInterval(abs(sLastSkip)); QTTime interval = QTMakeTimeWithTimeInterval(fabs(sLastSkip));
QTTime current = [currentMovie currentTime]; QTTime current = [currentMovie currentTime];
if (sLastSkip > 0) if (sLastSkip > 0)
current = QTTimeIncrement(current, interval); current = QTTimeIncrement(current, interval);

View File

@ -283,7 +283,7 @@ static NSPointerArray * sValidPasteboardData;
- (IBAction)copy:(id)sender - (IBAction)copy:(id)sender
{ {
[self tableView:nil writeRowsWithIndexes:[tagController selectionIndexes] toPasteboard:[NSPasteboard pasteboardWithName:NSGeneralPboard]]; [self tableView:tagTable writeRowsWithIndexes:[tagController selectionIndexes] toPasteboard:[NSPasteboard pasteboardWithName:NSGeneralPboard]];
} }
- (IBAction)cut:(id)sender - (IBAction)cut:(id)sender

View File

@ -38,7 +38,7 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>app</string> <string>app</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.aereperennius.${PRODUCT_NAME:rfc1034identifier}</string> <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>

File diff suppressed because it is too large Load Diff