actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Alright pumpervinil, you got your Delay wish.

Browse Source 
I hope that's enough for you.
This commit is contained in:
Jason Felds
2011-06-10 17:03:53 -04:00
parent 9a258e7042
commit 7768134149
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Languages/en.ini
+1
View File
@@ -814,6 +814,7 @@ CoinsPerCredit=Coins Per Credit
Connection=Connection Connection=Connection
Convert pause to beats=Convert pause to beats Convert pause to beats=Convert pause to beats
Convert selection to pause=Convert selection to pause Convert selection to pause=Convert selection to pause
Convert selection to delay=Convert selection to delay
Convert selection to warp=Convert selection to Warp Segment Convert selection to warp=Convert selection to Warp Segment
Convert selection to fake=Convert selection to Fake Segment Convert selection to fake=Convert selection to Fake Segment
Copy=Copy Copy=Copy
src/ScreenEdit.cpp
+23
View File
@@ -538,6 +538,8 @@ static MenuDef g_AlterMenu(
EditMode_Practice, true, true, 0, NULL ), EditMode_Practice, true, true, 0, NULL ),
MenuRowDef(ScreenEdit::convert_to_pause, "Convert selection to pause", true, MenuRowDef(ScreenEdit::convert_to_pause, "Convert selection to pause", true,
EditMode_Full, true, true, 0, NULL ), EditMode_Full, true, true, 0, NULL ),
MenuRowDef(ScreenEdit::convert_to_delay, "Convert selection to delay", true,
EditMode_Full, true, true, 0, NULL ),
MenuRowDef(ScreenEdit::convert_to_warp, "Convert selection to warp", true, MenuRowDef(ScreenEdit::convert_to_warp, "Convert selection to warp", true,
EditMode_Full, true, true, 0, NULL ), EditMode_Full, true, true, 0, NULL ),
MenuRowDef(ScreenEdit::convert_to_fake, "Convert selection to fake", true, MenuRowDef(ScreenEdit::convert_to_fake, "Convert selection to fake", true,
@@ -3719,6 +3721,27 @@ void ScreenEdit::HandleAlterMenuChoice(AlterMenuChoice c, const vector<int> &iAn
m_NoteFieldEdit.m_iEndMarker = -1; m_NoteFieldEdit.m_iEndMarker = -1;
break; break;
} }
case convert_to_delay:
{
ASSERT_M( m_NoteFieldEdit.m_iBeginMarker!=-1 && m_NoteFieldEdit.m_iEndMarker!=-1, "Attempted to convert beats outside the notefield to pauses!" );
float fMarkerStart = GetAppropriateTiming().GetElapsedTimeFromBeat( NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker) );
float fMarkerEnd = GetAppropriateTiming().GetElapsedTimeFromBeat( NoteRowToBeat(m_NoteFieldEdit.m_iEndMarker) );
// The length of the delay segment we're going to create. This includes time spent in any
// stops in the selection, which will be deleted and subsumed into the new stop.
float fStopLength = fMarkerEnd - fMarkerStart;
NoteDataUtil::DeleteRows( m_NoteDataEdit,
m_NoteFieldEdit.m_iBeginMarker,
m_NoteFieldEdit.m_iEndMarker-m_NoteFieldEdit.m_iBeginMarker
);
GetAppropriateTiming().DeleteRows( m_NoteFieldEdit.m_iBeginMarker,
m_NoteFieldEdit.m_iEndMarker-m_NoteFieldEdit.m_iBeginMarker );
GetAppropriateTiming().SetDelayAtRow( m_NoteFieldEdit.m_iBeginMarker, fStopLength );
m_NoteFieldEdit.m_iBeginMarker = -1;
m_NoteFieldEdit.m_iEndMarker = -1;
break;
}
case convert_to_warp: case convert_to_warp:
{ {
float startBeat = NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker); float startBeat = NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker);
src/ScreenEdit.h
+1
View File
@@ -385,6 +385,7 @@ public:
play, play,
record, record,
convert_to_pause, convert_to_pause,
convert_to_delay,
convert_to_warp, convert_to_warp,
convert_to_fake, convert_to_fake,
NUM_ALTER_MENU_CHOICES NUM_ALTER_MENU_CHOICES