aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-14 11:45:52 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-14 11:45:52 +0000
commit52cc4b6e5416c1bcd4e94abcec2e9532e4f66403 (patch)
tree3e412740692c91ea9669a1f7ae9cbb1c0ff0762e
parentc0f884274705ac9ee1cb56a876198d4fb334d7ca (diff)
downloadusdx-52cc4b6e5416c1bcd4e94abcec2e9532e4f66403.tar.gz
usdx-52cc4b6e5416c1bcd4e94abcec2e9532e4f66403.tar.xz
usdx-52cc4b6e5416c1bcd4e94abcec2e9532e4f66403.zip
completly remove solmization
new default values: - bgmusic = on - lyriceffect = shift git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2237 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/base/UIni.pas18
-rw-r--r--src/base/USong.pas46
2 files changed, 2 insertions, 62 deletions
diff --git a/src/base/UIni.pas b/src/base/UIni.pas
index 1ba47251..6f875e50 100644
--- a/src/base/UIni.pas
+++ b/src/base/UIni.pas
@@ -134,7 +134,6 @@ type
// Lyrics
LyricsFont: integer;
LyricsEffect: integer;
- Solmization: integer;
NoteLines: integer;
// Themes
@@ -233,7 +232,6 @@ const
ILyricsFont: array[0..2] of UTF8String = ('Plain', 'OLine1', 'OLine2');
ILyricsEffect: array[0..4] of UTF8String = ('Simple', 'Zoom', 'Slide', 'Ball', 'Shift');
- ISolmization: array[0..3] of UTF8String = ('Off', 'Euro', 'Jap', 'American');
INoteLines: array[0..1] of UTF8String = ('Off', 'On');
IColor: array[0..8] of UTF8String = ('Blue', 'Green', 'Pink', 'Red', 'Violet', 'Orange', 'Yellow', 'Brown', 'Black');
@@ -298,7 +296,6 @@ var
ILyricsFontTranslated: array[0..2] of UTF8String = ('Plain', 'OLine1', 'OLine2');
ILyricsEffectTranslated: array[0..4] of UTF8String = ('Simple', 'Zoom', 'Slide', 'Ball', 'Shift');
- ISolmizationTranslated: array[0..3] of UTF8String = ('Off', 'Euro', 'Jap', 'American');
INoteLinesTranslated: array[0..1] of UTF8String = ('Off', 'On');
IColorTranslated: array[0..8] of UTF8String = ('Blue', 'Green', 'Pink', 'Red', 'Violet', 'Orange', 'Yellow', 'Brown', 'Black');
@@ -420,11 +417,6 @@ begin
ILyricsEffectTranslated[3] := ULanguage.Language.Translate('OPTION_VALUE_BALL');
ILyricsEffectTranslated[4] := ULanguage.Language.Translate('OPTION_VALUE_SHIFT');
- ISolmizationTranslated[0] := ULanguage.Language.Translate('OPTION_VALUE_OFF');
- ISolmizationTranslated[1] := ULanguage.Language.Translate('OPTION_VALUE_EURO');
- ISolmizationTranslated[2] := ULanguage.Language.Translate('OPTION_VALUE_JAPAN');
- ISolmizationTranslated[3] := ULanguage.Language.Translate('OPTION_VALUE_AMERICAN');
-
INoteLinesTranslated[0] := ULanguage.Language.Translate('OPTION_VALUE_OFF');
INoteLinesTranslated[1] := ULanguage.Language.Translate('OPTION_VALUE_ON');
@@ -981,10 +973,7 @@ begin
LyricsFont := GetArrayIndex(ILyricsFont, IniFile.ReadString('Lyrics', 'LyricsFont', ILyricsFont[0]));
// Lyrics Effect
- LyricsEffect := GetArrayIndex(ILyricsEffect, IniFile.ReadString('Lyrics', 'LyricsEffect', ILyricsEffect[2]));
-
- // Solmization
- Solmization := GetArrayIndex(ISolmization, IniFile.ReadString('Lyrics', 'Solmization', ISolmization[0]));
+ LyricsEffect := GetArrayIndex(ILyricsEffect, IniFile.ReadString('Lyrics', 'LyricsEffect', ILyricsEffect[4]));
// NoteLines
NoteLines := GetArrayIndex(INoteLines, IniFile.ReadString('Lyrics', 'NoteLines', INoteLines[1]));
@@ -1013,7 +1002,7 @@ begin
{**
* Background music
*}
- BackgroundMusicOption := GetArrayIndex(IBackgroundMusic, IniFile.ReadString('Sound', 'BackgroundMusic', 'Off'));
+ BackgroundMusicOption := GetArrayIndex(IBackgroundMusic, IniFile.ReadString('Sound', 'BackgroundMusic', 'On'));
// EffectSing
EffectSing := GetArrayIndex(IEffectSing, IniFile.ReadString('Advanced', 'EffectSing', 'On'));
@@ -1136,9 +1125,6 @@ begin
// Lyrics Effect
IniFile.WriteString('Lyrics', 'LyricsEffect', ILyricsEffect[LyricsEffect]);
- // Solmization
- IniFile.WriteString('Lyrics', 'Solmization', ISolmization[Solmization]);
-
// NoteLines
IniFile.WriteString('Lyrics', 'NoteLines', INoteLines[NoteLines]);
diff --git a/src/base/USong.pas b/src/base/USong.pas
index 705206c4..07b1a6b5 100644
--- a/src/base/USong.pas
+++ b/src/base/USong.pas
@@ -90,7 +90,6 @@ type
FileLineNo : integer; // line, which is read last, for error reporting
function DecodeFilename(Filename: RawByteString): IPath;
- function Solmizate(Note: integer; Type_: integer): string;
procedure ParseNote(LineNumber: integer; TypeP: char; StartP, DurationP, NoteP: integer; LyricS: UTF8String);
procedure NewSentence(LineNumberP: integer; Param1, Param2: integer);
@@ -1135,53 +1134,8 @@ begin
Result := -1;
end;
-function TSong.Solmizate(Note: integer; Type_: integer): string;
-begin
- case (Type_) of
- 1: // european
- begin
- case (Note mod 12) of
- 0..1: Result := ' do ';
- 2..3: Result := ' re ';
- 4: Result := ' mi ';
- 5..6: Result := ' fa ';
- 7..8: Result := ' sol ';
- 9..10: Result := ' la ';
- 11: Result := ' si ';
- end;
- end;
- 2: // japanese
- begin
- case (Note mod 12) of
- 0..1: Result := ' do ';
- 2..3: Result := ' re ';
- 4: Result := ' mi ';
- 5..6: Result := ' fa ';
- 7..8: Result := ' so ';
- 9..10: Result := ' la ';
- 11: Result := ' shi ';
- end;
- end;
- 3: // american
- begin
- case (Note mod 12) of
- 0..1: Result := ' do ';
- 2..3: Result := ' re ';
- 4: Result := ' mi ';
- 5..6: Result := ' fa ';
- 7..8: Result := ' sol ';
- 9..10: Result := ' la ';
- 11: Result := ' ti ';
- end;
- end;
- end; // case
-end;
-
procedure TSong.ParseNote(LineNumber: integer; TypeP: char; StartP, DurationP, NoteP: integer; LyricS: UTF8String);
begin
- if (Ini.Solmization <> 0) then
- LyricS := Solmizate(NoteP, Ini.Solmization);
-
with Lines[LineNumber].Line[Lines[LineNumber].High] do
begin
SetLength(Note, Length(Note) + 1);