From e16bdc74f855c966fdc9dae632a201ff6518a2b5 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Thu, 21 Jul 2011 12:37:43 -0400 Subject: [PATCH 1/2] Keep the -sm5 suffix for Mac building. We'll deal with gcc vs clang another time. --- Xcode/stepmania.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index b0bdb79906..129716789f 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -1904,7 +1904,7 @@ 2BD06FE1137240CF0018CB9F /* json_value.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_value.cpp; path = ../extern/jsoncpp/src/lib_json/json_value.cpp; sourceTree = SOURCE_ROOT; }; 2BD06FE2137240CF0018CB9F /* json_valueiterator.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json_valueiterator.inl; path = ../extern/jsoncpp/src/lib_json/json_valueiterator.inl; sourceTree = SOURCE_ROOT; }; 2BD06FE3137240CF0018CB9F /* json_writer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = json_writer.cpp; path = ../extern/jsoncpp/src/lib_json/json_writer.cpp; sourceTree = SOURCE_ROOT; }; - 2BD6E10C13D78B36008443DB /* libzlib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libzlib.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 2BD6E10C13D78B36008443DB /* libzlib-sm5.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libzlib-sm5.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 2BD6E11713D78BAE008443DB /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = ""; }; 2BD6E11913D78BAE008443DB /* zlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zlib.h; sourceTree = ""; }; 2BD6E11E13D78C67008443DB /* zdll.lib */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = zdll.lib; sourceTree = ""; }; @@ -3315,7 +3315,7 @@ 2B17AB7213980FDF001AE57D /* libpng-1.5.1-sm5.a */, 2B17ABC013981521001AE57D /* libglew-sm5.a */, 2B17ABE013981756001AE57D /* libpcre-sm5.a */, - 2BD6E10C13D78B36008443DB /* libzlib.a */, + 2BD6E10C13D78B36008443DB /* libzlib-sm5.a */, ); name = Products; sourceTree = ""; @@ -5852,7 +5852,7 @@ ); name = zlib; productName = zlib; - productReference = 2BD6E10C13D78B36008443DB /* libzlib.a */; + productReference = 2BD6E10C13D78B36008443DB /* libzlib-sm5.a */; productType = "com.apple.product-type.library.static"; }; AA29CC240558741A00961A51 /* stepmania */ = { From fa0b14d4e43e28ed181f17b9a1469eb3fde4ae9f Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Thu, 21 Jul 2011 12:38:17 -0400 Subject: [PATCH 2/2] Untested F9/F10 sync code for split timing. Let someone else try this I think. --- src/ScreenSyncOverlay.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ScreenSyncOverlay.cpp b/src/ScreenSyncOverlay.cpp index af5b52cf44..5797634cc1 100644 --- a/src/ScreenSyncOverlay.cpp +++ b/src/ScreenSyncOverlay.cpp @@ -225,8 +225,17 @@ bool ScreenSyncOverlay::OverlayInput( const InputEventPlus &input ) } if( GAMESTATE->m_pCurSong != NULL ) { - BPMSegment * seg = GAMESTATE->m_pCurSong->m_SongTiming.GetBPMSegmentAtBeat( GAMESTATE->m_Position.m_fSongBeat ); + TimingData &sTiming = GAMESTATE->m_pCurSong->m_SongTiming; + BPMSegment * seg = sTiming.GetBPMSegmentAtBeat( GAMESTATE->m_Position.m_fSongBeat ); seg->SetBPS( seg->GetBPS() + fDelta ); + const vector& vpSteps = GAMESTATE->m_pCurSong->GetAllSteps(); + FOREACH( Steps*, const_cast&>(vpSteps), s ) + { + TimingData &pTiming = (*s)->m_Timing; + float second = sTiming.GetElapsedTimeFromBeat(GAMESTATE->m_Position.m_fSongBeat); + seg = pTiming.GetBPMSegmentAtBeat(pTiming.GetBeatFromElapsedTime(second)); + seg->SetBPS( seg->GetBPS() + fDelta ); + } } } break;