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

Remove sample length limitations

Browse Source
This commit is contained in:
AJ Kelly
2011-01-09 13:18:03 -06:00
parent 56b868ca1b
commit 06c7bbbd6c
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm-ssc.txt
+1
View File
@@ -17,6 +17,7 @@ sm-ssc in development | 20110???
-------- --------
* Add alternatives to Page Up and Page Down in the editor, mainly for * Add alternatives to Page Up and Page Down in the editor, mainly for
laptop users. [Wolfman2000] laptop users. [Wolfman2000]
* Removed Song sample length limitations. [freem]
================================================================================ ================================================================================
sm-ssc v1.2 | 20110107 sm-ssc v1.2 | 20110107
src/Song.cpp
+6 -9
View File
@@ -407,7 +407,7 @@ void Song::TidyUpData()
} }
} }
/* This must be done before radar calculation. */ // This must be done before radar calculation.
if( HasMusic() ) if( HasMusic() )
{ {
RString error; RString error;
@@ -418,7 +418,7 @@ void Song::TidyUpData()
{ {
LOG->UserLog( "Sound file", GetMusicPath(), "couldn't be opened: %s", error.c_str() ); LOG->UserLog( "Sound file", GetMusicPath(), "couldn't be opened: %s", error.c_str() );
/* Don't use this file. */ // Don't use this file.
m_sMusicFile = ""; m_sMusicFile = "";
} }
else if ( Sample != NULL ) else if ( Sample != NULL )
@@ -428,7 +428,7 @@ void Song::TidyUpData()
if( m_fMusicLengthSeconds < 0 ) if( m_fMusicLengthSeconds < 0 )
{ {
/* It failed; bad file or something. It's already logged a warning. */ // It failed; bad file or something. It's already logged a warning.
m_fMusicLengthSeconds = 100; // guess m_fMusicLengthSeconds = 100; // guess
} }
else if( m_fMusicLengthSeconds == 0 ) else if( m_fMusicLengthSeconds == 0 )
@@ -491,12 +491,9 @@ void Song::TidyUpData()
} }
} }
// The old logic meant that you couldn't have sample lengths that go forever,
/* Some DWIs have lengths in ms when they meant seconds, eg. #SAMPLELENGTH:10;. // e.g. those in Donkey Konga. I never liked that. -freem
* If the sample length is way too short, change it. */ if( m_fMusicSampleLengthSeconds <= 0.00f )
// oh also this means that if you try to have a sample length longer
// than 30 seconds, it won't work. -aj
if( m_fMusicSampleLengthSeconds < 3 || m_fMusicSampleLengthSeconds > 30 )
m_fMusicSampleLengthSeconds = DEFAULT_MUSIC_SAMPLE_LENGTH; m_fMusicSampleLengthSeconds = DEFAULT_MUSIC_SAMPLE_LENGTH;
// Here's the problem: We have a directory full of images. We want to determine which // Here's the problem: We have a directory full of images. We want to determine which