diff --git a/stepmania/Themes/default/Languages/de.ini b/stepmania/Themes/default/Languages/de.ini index 5a4c95c297..e36baed3c6 100644 --- a/stepmania/Themes/default/Languages/de.ini +++ b/stepmania/Themes/default/Languages/de.ini @@ -3,6 +3,12 @@ Autosync Machine=Autosync Maschine Autosync Song=Autosync Song Autosync: Correction NOT applied. Deviation too high.=Autosync: Korrektur NICHT möglich. Abweichung ist zu hoch. Autosync: Correction applied.=Autosync: Korrektur umgesetzt. +The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f).=Das Stopsegment Nummer #%d wurde geändert von %+.3f Sekunden auf %+.3f Sekunden (Veränderung von %+.3f) +earlier=früher +later=später +%s tempo segment from %+.3f BPM to %+.3f BPM.=%s Temposegment von %+.3f BPM auf %+.3f BPM. +Global Offset from %+.3f to %+.3f (notes %s)=Globale Verschiebung von %+.3f auf %+.3f (Noten %s) +Song offset from %+.3f to %+.3f (notes %s)=Song Verschiebung von %+.3f auf %+.3f (Noten %s) [Arch] Couldn't create a movie driver.=Konnte Filmdriver nicht erzeugen. @@ -1200,14 +1206,8 @@ You must define a Profile.=Sie müssen ein Profil definieren. [ScreenSaveSync] Choosing NO will discard your changes.=Mit NEIN werden Ihre Änderungen verworfen. -The BPM segment number #%d changed from %+.3f BPS to %+.3f BPS (change of %+.3f).=Das BPM Segment Nummer #%d wurde geändert von %+.3f BPS auf %+.3f BPS (Veränderung von %+.3f) -The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f).=Das Stopsegment Nummer #%d wurde geändert von %+.3f Sekunden auf %+.3f Sekunden (Veränderung von %+.3f) Would you like to save these changes?=Möchten Sie diese Änderungen speichern? -You have changed the Global Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s).=Sie haben das Global Offset von %+.3f auf %+.3f geändert (Veränderung von %+.3f, damit sind die Noten %s). -You have changed the Song Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s).=Sie haben das Song Offset von %+.3f auf %+.3f geändert (Veränderung von %+.3f, damit sind die Noten %s). You have changed the timing of=Sie haben das Timing geändert von -earlier=früher -later=später [ScreenSelectCharacter] HelpText=Mit &LEFT; &RIGHT; wählen, dann START drücken @@ -1271,14 +1271,11 @@ HelpText=&UP; &DOWN; schaltet zwischen Zeilen um &LEFT; &RIGHT; wählt Option HelpText=&UP; &DOWN; schaltet zwischen Zeilen um &LEFT; &RIGHT; wählt Optionen an::START Änderungen annehmen ZURÜCK Änderungen verwerfen [ScreenSyncOverlay] -%s tempo segment from %+.3f BPM to %+.3f BPM.=%s Temposegment von %+.3f BPM auf %+.3f BPM. AutoPlay=AutoSpielen AutoPlayCPU=AutoSpielenCPU AutoSync Machine=AutoSync Maschine AutoSync Song=AutoSync Song Can't sync while playing a course.=Kann während eines laufenden Kurses nicht synchronisieren. -Global Offset from %+.3f to %+.3f (notes %s)=Globale Verschiebung von %+.3f auf %+.3f (Noten %s) -Song offset from %+.3f to %+.3f (notes %s)=Song Verschiebung von %+.3f auf %+.3f (Noten %s) Sync changes reverted.=Sync Veränderungen rückgängig gemacht. earlier=früher later=später diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 511bee0d78..6ef9fbc2bf 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -845,6 +845,12 @@ Autosync Machine=Autosync Machine Autosync Song=Autosync Song Autosync: Correction NOT applied. Deviation too high.=Autosync: Correction NOT applied. Deviation too high. Autosync: Correction applied.=Autosync: Correction applied. +The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f).=The stop segment number #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f). +earlier=earlier +later=later +%s tempo segment from %+.3f BPM to %+.3f BPM.=%s tempo segment from %+.3f BPM to %+.3f BPM. +Global Offset from %+.3f to %+.3f (notes %s)=Global Offset from %+.3f to %+.3f (notes %s) +Song offset from %+.3f to %+.3f (notes %s)=Song offset from %+.3f to %+.3f (notes %s) [ProfileAction] Clear=Clear @@ -1174,14 +1180,8 @@ You must define a Profile.=You must define a Profile. [ScreenSaveSync] Choosing NO will discard your changes.=Choosing NO will discard your changes. -The BPM segment number #%d changed from %+.3f BPS to %+.3f BPS (change of %+.3f).=The BPM segment number #%d changed from %+.3f BPS to %+.3f BPS (change of %+.3f). -The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f).=The stop segment number #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f). Would you like to save these changes?=Would you like to save these changes? -You have changed the Global Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s).=You have changed the Global Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s). -You have changed the Song Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s).=You have changed the Song Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s). You have changed the timing of=You have changed the timing of -earlier=earlier -later=later [ScreenSelectCharacter] HelpText=Use &LEFT; &RIGHT; to select, then press START @@ -1248,14 +1248,11 @@ HelpText=&UP; &DOWN; to change line &LEFT; &RIGHT; to select between options:: HelpText= [ScreenSyncOverlay] -%s tempo segment from %+.3f BPM to %+.3f BPM.=%s tempo segment from %+.3f BPM to %+.3f BPM. AutoPlay=AutoPlay AutoPlayCPU=AutoPlayCPU AutoSync Machine=AutoSync Machine AutoSync Song=AutoSync Song Can't sync while playing a course.=Can't sync while playing a course. -Global Offset from %+.3f to %+.3f (notes %s)=Global Offset from %+.3f to %+.3f (notes %s) -Song offset from %+.3f to %+.3f (notes %s)=Song offset from %+.3f to %+.3f (notes %s) Sync changes reverted.=Sync changes reverted. earlier=earlier later=later diff --git a/stepmania/Themes/default/Languages/es.ini b/stepmania/Themes/default/Languages/es.ini index 7fc56b0526..57e795940f 100644 --- a/stepmania/Themes/default/Languages/es.ini +++ b/stepmania/Themes/default/Languages/es.ini @@ -3,6 +3,12 @@ Autosync Machine=Máquina Autosync Autosync Song=Canción Autosync Autosync: Correction NOT applied. Deviation too high.=Autosync: Corrección NO aplicada. desviación demasiado alta Autosync: Correction applied.=Autosync: Corrección aplicada +The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f).=El número de segmento detenido #%d cambio de %+.3f segundos a %+.3f segundos (cambio de %+.3f) +earlier=antes +later=después +%s tempo segment from %+.3f BPM to %+.3f BPM.=Segmento de tempo %s desde %+.3f BPM a %+.3f BPM +Global Offset from %+.3f to %+.3f (notes %s)=Offset Global de %+.3f a %+.3f (notas %s) +Song offset from %+.3f to %+.3f (notes %s)=Offset de Canción de %+.3f a %+.3f (notas %s) [Arch] Couldn't create a movie driver.=No pudo crear un vídeo del juego @@ -1199,14 +1205,8 @@ You must define a Profile.=Debes definir un Perfil [ScreenSaveSync] Choosing NO will discard your changes.=Si escoges NO eliminarás los cambios -The BPM segment number #%d changed from %+.3f BPS to %+.3f BPS (change of %+.3f).=El segmento BPM número #%d ha cambiado de %+.3f BPS a %+.3f BPS (cambio de %+.3f) -The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f).=El número de segmento detenido #%d cambio de %+.3f segundos a %+.3f segundos (cambio de %+.3f) Would you like to save these changes?=¿Quieres guardar estos cambios? -You have changed the Global Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s).=Has cambiado el Offset Global de %+.3f a %+.3f (cambio de porcentaje %+.3f, hacen las notas %s) -You have changed the Song Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s).=Has cambiado el Offset de la Canción de %+.3f a %+.3f (cambio de %+.3f, realizando las notas %s) You have changed the timing of=Has cambiado el tiempo de -earlier=antes -later=después [ScreenSelectCharacter] HelpText=Utiliza &LEFT; &RIGHT; para seleccionar, despues presiona START @@ -1270,14 +1270,11 @@ HelpText=&UP; &DOWN; para cambiar línea. &LEFT; &RIGHT; para seleccionar opcio HelpText=&UP; &DOWN; para cambiar línea. &LEFT; &RIGHT; para seleccionar opciones::START para aceptar cambios. HACIA ATRÁS para deshacer cambios. [ScreenSyncOverlay] -%s tempo segment from %+.3f BPM to %+.3f BPM.=Segmento de tempo %s desde %+.3f BPM a %+.3f BPM AutoPlay=Autoreproducción AutoPlayCPU=CPU Autoplay AutoSync Machine=Máquina Autosync AutoSync Song=Canción Autosync Can't sync while playing a course.=No pudo sincronizarlo mientras reproducía un course -Global Offset from %+.3f to %+.3f (notes %s)=Offset Global de %+.3f a %+.3f (notas %s) -Song offset from %+.3f to %+.3f (notes %s)=Offset de Canción de %+.3f a %+.3f (notas %s) Sync changes reverted.=Revertidos los cambios sync earlier=Antes later=Después diff --git a/stepmania/Themes/default/Languages/fr.ini b/stepmania/Themes/default/Languages/fr.ini index 239d846531..82c7c459fb 100644 --- a/stepmania/Themes/default/Languages/fr.ini +++ b/stepmania/Themes/default/Languages/fr.ini @@ -3,6 +3,12 @@ Autosync Machine=Console Autosync. Autosync Song=Chanson Autosync. Autosync: Correction NOT applied. Deviation too high.=Autosync.: Correction NON appliquée. Déviation trop importante. Autosync: Correction applied.=Autosync.: Correction appliquée. +The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f).=Le segment stop numéro #%d a changé de %+.3f secondes en %+.3f secondes (changement de %+.3f). +earlier=plus tôt +later=plus tard +%s tempo segment from %+.3f BPM to %+.3f BPM.=%s segment tempo de %+.3f BPM à %+.3f BPM. +Global Offset from %+.3f to %+.3f (notes %s)=Offsett global de %+.3f à %+.3f (notes %s) +Song offset from %+.3f to %+.3f (notes %s)=Offset chanson de %+.3f à %+.3f (notes %s) [Arch] Couldn't create a movie driver.=Impossible de créer un pilote vidéo. @@ -1199,14 +1205,8 @@ You must define a Profile.=Vous devez définir un Profil. [ScreenSaveSync] Choosing NO will discard your changes.=Choisir NON annulera vos changements. -The BPM segment number #%d changed from %+.3f BPS to %+.3f BPS (change of %+.3f).=Le segment BPM numéro #%d a changé de %+.3f BPS en %+.3f BPS (changement de %+.3f). -The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f).=Le segment stop numéro #%d a changé de %+.3f secondes en %+.3f secondes (changement de %+.3f). Would you like to save these changes?=Voulez-vous enregistrer ces changements? -You have changed the Global Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s).=Vous avez changé l'Offsett global de %+.3f à %+.3f (changement de %+.3f, en faisant les notes %s). -You have changed the Song Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s).=Vous avez changé l'Offsett Chanson de %+.3f à %+.3f (changement de %+.3f, en faisant les notes %s). You have changed the timing of=Vous avez chnagé le timing de -earlier=plus tôt -later=plus tard [ScreenSelectCharacter] HelpText=Utilisez &LEFT; &RIGHT; pour sélectionner, et appuyez sur DEMARRER @@ -1270,14 +1270,11 @@ HelpText=&UP; &DOWN; pour changer de ligne &LEFT; &RIGHT; pour sélectionner les HelpText=&UP; &DOWN; pour changer de ligne &LEFT; &RIGHT; pour sélectionner les options::DEMARRER pour accepter les changements RETOUR pour rejeter les changements [ScreenSyncOverlay] -%s tempo segment from %+.3f BPM to %+.3f BPM.=%s segment tempo de %+.3f BPM à %+.3f BPM. AutoPlay=AutoPlay AutoPlayCPU=AutoPlayCPU AutoSync Machine=Console AutoSync. AutoSync Song=Chanson AutoSync. Can't sync while playing a course.=Sync. impossible pendant qu'un cours est joué. -Global Offset from %+.3f to %+.3f (notes %s)=Offsett global de %+.3f à %+.3f (notes %s) -Song offset from %+.3f to %+.3f (notes %s)=Offset chanson de %+.3f à %+.3f (notes %s) Sync changes reverted.=Chnagements sync. annulés. earlier=plus tôt later=plus tard diff --git a/stepmania/Themes/default/Languages/it.ini b/stepmania/Themes/default/Languages/it.ini index e49ac6f470..94382cf221 100644 --- a/stepmania/Themes/default/Languages/it.ini +++ b/stepmania/Themes/default/Languages/it.ini @@ -3,6 +3,12 @@ Autosync Machine=Macchina Autosync Autosync Song=Canzone Autosync Autosync: Correction NOT applied. Deviation too high.=Autosync: correzione NON effettuata. Troppo differente. Autosync: Correction applied.=Autosync: correzione effettuata. +The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f).=Il numero del segmento di stop #%d è cambiato da %+.3f BPS a %+.3f BPS (cambio di %+.3f). +earlier=prima +later=dopo +%s tempo segment from %+.3f BPM to %+.3f BPM.=Segmento tempo %s da %+.3f BPM a %+.3f BPM. +Global Offset from %+.3f to %+.3f (notes %s)=Offset Globale da %+.3f to %+.3f ( note %s). +Song offset from %+.3f to %+.3f (notes %s)=Offset Canzone da %+.3f to %+.3f ( note %s). [Arch] Couldn't create a movie driver.=Impossibile creare driver per movie @@ -1199,14 +1205,8 @@ You must define a Profile.=Devi definire un profilo. [ScreenSaveSync] Choosing NO will discard your changes.=Scegliendo NO le tue modifiche verranno scartate. -The BPM segment number #%d changed from %+.3f BPS to %+.3f BPS (change of %+.3f).=Il numero del segmento BPM #%d è cambiato da %+.3f BPS a %+.3f BPS (cambio di %+.3f). -The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f).=Il numero del segmento di stop #%d è cambiato da %+.3f BPS a %+.3f BPS (cambio di %+.3f). Would you like to save these changes?=Vuoi salvare queste modifiche prima di uscire? -You have changed the Global Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s).=Hai cambiato l'Offset Globale da %+.3f to %+.3f (cambio di %+.3f che rende le note %s). -You have changed the Song Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s).=Hai cambiato l'Offset della Canzone da %+.3f to %+.3f (cambio di %+.3f, che rende le note %s). You have changed the timing of=Hai cambiato i tempi di -earlier=prima -later=dopo [ScreenSelectCharacter] HelpText=Usa &LEFT; &RIGHT; poi, per selezionare, premi AVVIA @@ -1270,14 +1270,11 @@ HelpText=&UP; &DOWN; per cambiare linea &LEFT; &RIGHT; per selezionare le opzi HelpText=&UP; &DOWN; per cambiare linea &LEFT; &RIGHT; per selezionare le opzioni::AVVIA per accettare le modifiche INDIETRO per rifiutare le modifiche [ScreenSyncOverlay] -%s tempo segment from %+.3f BPM to %+.3f BPM.=Segmento tempo %s da %+.3f BPM a %+.3f BPM. AutoPlay=AutoPlay AutoPlayCPU=AutoPlayCPU AutoSync Machine=AutoSync Macchina AutoSync Song=AutoSync Canzone Can't sync while playing a course.=Impossibile sincronizzare durante un percorso -Global Offset from %+.3f to %+.3f (notes %s)=Offset Globale da %+.3f to %+.3f ( note %s). -Song offset from %+.3f to %+.3f (notes %s)=Offset Canzone da %+.3f to %+.3f ( note %s). Sync changes reverted.=Modifiche sync revertite earlier=prima later=dopo diff --git a/stepmania/src/AdjustSync.cpp b/stepmania/src/AdjustSync.cpp index a2140efb17..3949108154 100644 --- a/stepmania/src/AdjustSync.cpp +++ b/stepmania/src/AdjustSync.cpp @@ -114,6 +114,84 @@ void AdjustSync::HandleAutosync( float fNoteOffBySeconds ) } +static LocalizedString EARLIER ("AdjustSync","earlier"); +static LocalizedString LATER ("AdjustSync","later"); +static LocalizedString GLOBAL_OFFSET_FROM ( "AdjustSync", "Global Offset from %+.3f to %+.3f (notes %s)" ); +static LocalizedString SONG_OFFSET_FROM ( "AdjustSync", "Song offset from %+.3f to %+.3f (notes %s)" ); +static LocalizedString TEMPO_SEGMENT_FROM ( "AdjustSync", "%s tempo segment from %+.3f BPM to %+.3f BPM." ); +static LocalizedString CHANGED_STOP ("AdjustSync","The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f)."); + +void AdjustSync::GetSyncChangeTextGlobal( vector &vsAddTo ) +{ + { + float fOld = Quantize( AdjustSync::s_fGlobalOffsetSecondsOriginal, 0.001f ); + float fNew = Quantize( PREFSMAN->m_fGlobalOffsetSeconds, 0.001f ) ; + float fDelta = fNew - fOld; + + if( fabs(fDelta) > 0.00001 ) + { + vsAddTo.push_back( ssprintf( + GLOBAL_OFFSET_FROM.GetValue(), + fOld, + fNew, + (fDelta > 0 ? EARLIER:LATER).GetValue().c_str() ) ); + } + } +} + +void AdjustSync::GetSyncChangeTextSong( vector &vsAddTo ) +{ + if( GAMESTATE->m_pCurSong.Get() ) + { + { + float fOld = Quantize( AdjustSync::s_pTimingDataOriginal->m_fBeat0OffsetInSeconds, 0.001f ); + float fNew = Quantize( GAMESTATE->m_pCurSong->m_Timing.m_fBeat0OffsetInSeconds, 0.001f ); + float fDelta = fNew - fOld; + + if( fabs(fDelta) > 0.00001 ) + { + vsAddTo.push_back( ssprintf( + SONG_OFFSET_FROM.GetValue(), + fOld, + fNew, + (fDelta > 0 ? EARLIER:LATER).GetValue().c_str() ) ); + } + } + + for( unsigned i=0; im_pCurSong->m_Timing.m_BPMSegments.size(); i++ ) + { + float fOld = Quantize( AdjustSync::s_pTimingDataOriginal->m_BPMSegments[i].m_fBPS, 0.001f ); + float fNew = Quantize( GAMESTATE->m_pCurSong->m_Timing.m_BPMSegments[i].m_fBPS, 0.001f ); + float fDelta = fNew - fOld; + + if( fabs(fDelta) > 0.00001 ) + { + vsAddTo.push_back( ssprintf( + TEMPO_SEGMENT_FROM.GetValue(), + FormatNumberAndSuffix(i+1).c_str(), + fOld, + fNew ) ); + } + } + + for( unsigned i=0; im_pCurSong->m_Timing.m_StopSegments.size(); i++ ) + { + float fOld = Quantize( AdjustSync::s_pTimingDataOriginal->m_StopSegments[i].m_fStopSeconds, 0.001f ); + float fNew = Quantize( GAMESTATE->m_pCurSong->m_Timing.m_StopSegments[i].m_fStopSeconds, 0.001f ); + float fDelta = fNew - fOld; + + if( fabs(fDelta) > 0.00001 ) + { + vsAddTo.push_back( ssprintf( + CHANGED_STOP.GetValue(), + i+1, + fOld, + fNew ) ); + } + } + } +} + /* * (c) 2003-2004 Chris Danford * All rights reserved. diff --git a/stepmania/src/AdjustSync.h b/stepmania/src/AdjustSync.h index 9b356e5724..48127f0a89 100644 --- a/stepmania/src/AdjustSync.h +++ b/stepmania/src/AdjustSync.h @@ -15,6 +15,8 @@ public: static void SaveSyncChanges(); static void RevertSyncChanges(); static void HandleAutosync( float fNoteOffBySeconds ); + static void GetSyncChangeTextGlobal( vector &vsAddTo ); + static void GetSyncChangeTextSong( vector &vsAddTo ); static float s_fAutosyncOffset[SAMPLE_COUNT]; static int s_iAutosyncOffsetSample; diff --git a/stepmania/src/ScreenSaveSync.cpp b/stepmania/src/ScreenSaveSync.cpp index 4d517e965f..b1b1f6a88d 100644 --- a/stepmania/src/ScreenSaveSync.cpp +++ b/stepmania/src/ScreenSaveSync.cpp @@ -6,12 +6,6 @@ #include "LocalizedString.h" #include "AdjustSync.h" -static LocalizedString EARLIER ("ScreenSaveSync","earlier"); -static LocalizedString LATER ("ScreenSaveSync","later"); -static LocalizedString CHANGED_GLOBAL_OFFSET ("ScreenSaveSync","You have changed the Global Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s)."); -static LocalizedString CHANGED_SONG_OFFSET ("ScreenSaveSync","You have changed the Song Offset from %+.3f to %+.3f (change of %+.3f, making the notes %s)."); -static LocalizedString CHANGED_BPM ("ScreenSaveSync","The BPM segment number #%d changed from %+.3f BPS to %+.3f BPS (change of %+.3f)."); -static LocalizedString CHANGED_STOP ("ScreenSaveSync","The stop segment #%d changed from %+.3f seconds to %+.3f seconds (change of %+.3f)."); static LocalizedString CHANGED_TIMING_OF ("ScreenSaveSync","You have changed the timing of"); static LocalizedString WOULD_YOU_LIKE_TO_SAVE ("ScreenSaveSync","Would you like to save these changes?"); static LocalizedString CHOOSING_NO_WILL_DISCARD ("ScreenSaveSync","Choosing NO will discard your changes."); @@ -20,89 +14,28 @@ static RString GetPromptText() RString s; { - float fOld = Quantize( AdjustSync::s_fGlobalOffsetSecondsOriginal, 0.001f ); - float fNew = Quantize( PREFSMAN->m_fGlobalOffsetSeconds, 0.001f ) ; - float fDelta = fNew - fOld; + vector vs; + AdjustSync::GetSyncChangeTextGlobal( vs ); + if( !vs.empty() ) + s += join( "\n", vs ) + "\n\n"; + } - if( fabs(fDelta) > 0.00001 ) + { + vector vs; + AdjustSync::GetSyncChangeTextSong( vs ); + if( !vs.empty() ) { s += ssprintf( - CHANGED_GLOBAL_OFFSET.GetValue()+"\n\n", - fOld, - fNew, - fDelta, - (fDelta > 0 ? EARLIER:LATER).GetValue().c_str() ); + CHANGED_TIMING_OF.GetValue()+"\n" + "%s:\n" + "\n", + GAMESTATE->m_pCurSong->GetDisplayFullTitle().c_str() ); + + s += join( "\n", vs ) + "\n\n"; } } - vector vsSongChanges; - - if( GAMESTATE->m_pCurSong.Get() ) - { - { - float fOld = Quantize( AdjustSync::s_pTimingDataOriginal->m_fBeat0OffsetInSeconds, 0.001f ); - float fNew = Quantize( GAMESTATE->m_pCurSong->m_Timing.m_fBeat0OffsetInSeconds, 0.001f ); - float fDelta = fNew - fOld; - - if( fabs(fDelta) > 0.00001 ) - { - vsSongChanges.push_back( ssprintf( - CHANGED_SONG_OFFSET.GetValue()+"\n\n", - fOld, - fNew, - fDelta, - (fDelta > 0 ? EARLIER:LATER).GetValue().c_str() ) ); - } - } - - for( unsigned i=0; im_pCurSong->m_Timing.m_BPMSegments.size(); i++ ) - { - float fOld = Quantize( AdjustSync::s_pTimingDataOriginal->m_BPMSegments[i].m_fBPS, 0.001f ); - float fNew = Quantize( GAMESTATE->m_pCurSong->m_Timing.m_BPMSegments[i].m_fBPS, 0.001f ); - float fDelta = fNew - fOld; - - if( fabs(fDelta) > 0.00001 ) - { - vsSongChanges.push_back( ssprintf( - CHANGED_BPM.GetValue()+"\n\n", - i+1, - fOld, - fNew, - fDelta ) ); - } - } - - for( unsigned i=0; im_pCurSong->m_Timing.m_StopSegments.size(); i++ ) - { - float fOld = Quantize( AdjustSync::s_pTimingDataOriginal->m_StopSegments[i].m_fStopSeconds, 0.001f ); - float fNew = Quantize( GAMESTATE->m_pCurSong->m_Timing.m_StopSegments[i].m_fStopSeconds, 0.001f ); - float fDelta = fNew - fOld; - - if( fabs(fDelta) > 0.00001 ) - { - vsSongChanges.push_back( ssprintf( - CHANGED_STOP.GetValue()+"\n\n", - i+1, - fOld, - fNew, - fDelta ) ); - } - } - } - - if( !vsSongChanges.empty() ) - { - s += ssprintf( - CHANGED_TIMING_OF.GetValue()+"\n" - "%s:\n" - "\n", - GAMESTATE->m_pCurSong->GetDisplayFullTitle().c_str() ); - - s += join( "\n", vsSongChanges ); - } - - s +="\n\n"+ - WOULD_YOU_LIKE_TO_SAVE.GetValue()+"\n"+ + s += WOULD_YOU_LIKE_TO_SAVE.GetValue()+"\n"+ CHOOSING_NO_WILL_DISCARD.GetValue(); return s; } diff --git a/stepmania/src/ScreenSyncOverlay.cpp b/stepmania/src/ScreenSyncOverlay.cpp index da172e60ec..f0e9eb755b 100644 --- a/stepmania/src/ScreenSyncOverlay.cpp +++ b/stepmania/src/ScreenSyncOverlay.cpp @@ -82,11 +82,6 @@ static LocalizedString AUTO_PLAY ( "ScreenSyncOverlay", "AutoPlay" ); static LocalizedString AUTO_PLAY_CPU ( "ScreenSyncOverlay", "AutoPlayCPU" ); static LocalizedString AUTO_SYNC_SONG ( "ScreenSyncOverlay", "AutoSync Song" ); static LocalizedString AUTO_SYNC_MACHINE ( "ScreenSyncOverlay", "AutoSync Machine" ); -static LocalizedString EARLIER ( "ScreenSyncOverlay", "earlier" ); -static LocalizedString LATER ( "ScreenSyncOverlay", "later" ); -static LocalizedString GLOBAL_OFFSET_FROM ( "ScreenSyncOverlay", "Global Offset from %+.3f to %+.3f (notes %s)" ); -static LocalizedString SONG_OFFSET_FROM ( "ScreenSyncOverlay", "Song offset from %+.3f to %+.3f (notes %s)" ); -static LocalizedString TEMPO_SEGMENT_FROM ( "ScreenSyncOverlay", "%s tempo segment from %+.3f BPM to %+.3f BPM." ); void ScreenSyncOverlay::UpdateText() { vector vs; @@ -109,53 +104,8 @@ void ScreenSyncOverlay::UpdateText() if( GAMESTATE->m_pCurSong != NULL && !GAMESTATE->IsCourseMode() ) // sync controls available { - { - float fOld = AdjustSync::s_fGlobalOffsetSecondsOriginal; - float fNew = PREFSMAN->m_fGlobalOffsetSeconds; - float fDelta = fNew - fOld; - - if( fabsf(fDelta) > 0.00001f ) - { - vs.push_back( ssprintf( - GLOBAL_OFFSET_FROM.GetValue(), - fOld, - fNew, - (fDelta > 0 ? EARLIER:LATER).GetValue().c_str() ) ); - } - } - - { - float fOld = AdjustSync::s_pTimingDataOriginal->m_fBeat0OffsetInSeconds; - float fNew = GAMESTATE->m_pCurSong->m_Timing.m_fBeat0OffsetInSeconds; - float fDelta = fNew - fOld; - - if( fabsf(fDelta) > 0.00001f ) - { - vs.push_back( ssprintf( - SONG_OFFSET_FROM.GetValue(), - fOld, - fNew, - (fDelta > 0 ? EARLIER:LATER).GetValue().c_str() ) ); - } - } - - ASSERT( AdjustSync::s_pTimingDataOriginal->m_BPMSegments.size() == GAMESTATE->m_pCurSong->m_Timing.m_BPMSegments.size() ); - - for( unsigned i=0; im_pCurSong->m_Timing.m_BPMSegments.size(); i++ ) - { - float fOldBpm = AdjustSync::s_pTimingDataOriginal->m_BPMSegments[i].m_fBPS * 60; - float fNewBpm = GAMESTATE->m_pCurSong->m_Timing.m_BPMSegments[i].m_fBPS * 60; - float fDelta = fNewBpm - fOldBpm; - - if( fabsf(fDelta) > 0.00001f ) - { - vs.push_back( ssprintf( - TEMPO_SEGMENT_FROM.GetValue(), - FormatNumberAndSuffix(i+1).c_str(), - fOldBpm, - fNewBpm ) ); - } - } + AdjustSync::GetSyncChangeTextGlobal( vs ); + AdjustSync::GetSyncChangeTextSong( vs ); } m_textStatus.SetText( join("\n",vs) );