diff --git a/Sources/VLModel.cpp b/Sources/VLModel.cpp index 8d93805..c8f1b97 100644 --- a/Sources/VLModel.cpp +++ b/Sources/VLModel.cpp @@ -863,7 +863,7 @@ static void TransposePinned(int8_t & pitch, int semi) pitch = octave+pitchInOctave; } -void VLSong::ChangeKey(int newKey, bool newMode, bool transpose) +void VLSong::ChangeKey(int newKey, int newMode, bool transpose) { VLProperties & prop = fProperties.front(); int semi = 7*(newKey-prop.fKey) % 12; diff --git a/Sources/VLModel.h b/Sources/VLModel.h index cf8977f..31fd2bf 100644 --- a/Sources/VLModel.h +++ b/Sources/VLModel.h @@ -335,7 +335,7 @@ public: bool DoesTieWithPrevRepeat(size_t measure) const; bool DoesTieWithNextRepeat(size_t measure) const; bool IsNonEmpty() const; - void ChangeKey(int newKey, bool newMode, bool transpose); + void ChangeKey(int newKey, int newMode, bool transpose); void ChangeDivisions(int newDivisions); void ChangeTime(VLFraction newTime); diff --git a/VocalEasel.xcodeproj/project.pbxproj b/VocalEasel.xcodeproj/project.pbxproj index 6bd34e1..167516b 100644 --- a/VocalEasel.xcodeproj/project.pbxproj +++ b/VocalEasel.xcodeproj/project.pbxproj @@ -773,7 +773,7 @@ 95D7BF750AA699C600D5E02C /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; USER_HEADER_SEARCH_PATHS = "Sources/**"; }; name = Development; @@ -781,14 +781,14 @@ 95D7BF760AA699C600D5E02C /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; }; name = Deployment; }; 95D7BF770AA699C600D5E02C /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; }; name = Default; };