Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1340] trunk/OpenMPT
|
From: <sag...@us...> - 2012-08-05 18:32:38
|
Revision: 1340
http://modplug.svn.sourceforge.net/modplug/?rev=1340&view=rev
Author: saga-games
Date: 2012-08-05 18:32:31 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
[Fix] Some changes in the 669 required the format to be converted to S3M internally. Forgot to commit this change.
[Mod] Since the DSound driver seems to be buggy (see various reports on the issue tracker), OpenMPT defaults to WaveOut now if there's no ASIO driver present.
[Ref] Some small cleanups.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/InputHandler.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/soundlib/Load_itp.cpp
trunk/OpenMPT/soundlib/ModChannel.cpp
trunk/OpenMPT/soundlib/load_j2b.cpp
Modified: trunk/OpenMPT/mptrack/InputHandler.cpp
===================================================================
--- trunk/OpenMPT/mptrack/InputHandler.cpp 2012-08-05 18:06:20 UTC (rev 1339)
+++ trunk/OpenMPT/mptrack/InputHandler.cpp 2012-08-05 18:32:31 UTC (rev 1340)
@@ -506,7 +506,7 @@
case ID_ADD_SOUNDBANK: s="Add Sound &Bank...\t"; c = kcFileAddSoundBank; break;
case ID_PLAYER_PLAY: s="Pause / &Resume\t"; c = kcPlayPauseSong; break;
- case ID_PLAYER_PLAYFROMSTART: s="&Play from start\t"; c = kcPlaySongFromStart; break;
+ case ID_PLAYER_PLAYFROMSTART: s="&Play from Start\t"; c = kcPlaySongFromStart; break;
case ID_PLAYER_STOP: s="&Stop\t"; c = kcStopSong; break;
case ID_PLAYER_PAUSE: s="P&ause\t"; c = kcPauseSong; break;
case ID_MIDI_RECORD: s="&MIDI Record\t"; c = kcMidiRecord; break;
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2012-08-05 18:06:20 UTC (rev 1339)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2012-08-05 18:32:31 UTC (rev 1340)
@@ -374,7 +374,6 @@
bModified = FALSE;
break;
case MOD_TYPE_AMF0:
- case MOD_TYPE_669:
m_SndFile.ChangeModTypeTo(MOD_TYPE_MOD);
break;
case MOD_TYPE_MED:
@@ -387,6 +386,7 @@
m_SndFile.m_nType = MOD_TYPE_XM;
}
break;
+ case MOD_TYPE_669:
case MOD_TYPE_FAR:
case MOD_TYPE_PTM:
case MOD_TYPE_STM:
Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2012-08-05 18:06:20 UTC (rev 1339)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2012-08-05 18:32:31 UTC (rev 1340)
@@ -301,11 +301,7 @@
rgbCustomColors[ncol] = CMainFrame::GetPrivateProfileDWord("Display", s, rgbCustomColors[ncol], iniFile);
}
-#ifndef NO_DSOUND
- DWORD defaultDevice = SNDDEV_BUILD_ID(0, SNDDEV_DSOUND); // first DirectSound device
-#else
DWORD defaultDevice = SNDDEV_BUILD_ID(0, SNDDEV_WAVEOUT); // first WaveOut device
-#endif // NO_DSOUND
#ifndef NO_ASIO
// If there's an ASIO device available, prefer it over DirectSound
if(EnumerateSoundDevices(SNDDEV_ASIO, 0, nullptr, 0))
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2012-08-05 18:06:20 UTC (rev 1339)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2012-08-05 18:32:31 UTC (rev 1340)
@@ -212,13 +212,13 @@
m_CheckBox6.SetCheck(m_pSndFile->m_SongFlags[SONG_ITPEMBEDIH] ? MF_CHECKED : 0);
// -! NEW_FEATURE#0023
- const DWORD allowedFlags = m_pSndFile->GetModSpecifications(type).songFlags;
- m_CheckBox1.EnableWindow((allowedFlags & SONG_LINEARSLIDES) != 0);
- m_CheckBox2.EnableWindow((allowedFlags & SONG_FASTVOLSLIDES) != 0);
- m_CheckBox3.EnableWindow((allowedFlags & SONG_ITOLDEFFECTS) != 0);
- m_CheckBox4.EnableWindow((allowedFlags & SONG_ITCOMPATGXX) != 0);
- m_CheckBox5.EnableWindow((allowedFlags & SONG_EXFILTERRANGE) != 0);
- m_CheckBoxPT1x.EnableWindow((allowedFlags & SONG_PT1XMODE) != 0);
+ const FlagSet<SongFlags> allowedFlags(m_pSndFile->GetModSpecifications(type).songFlags);
+ m_CheckBox1.EnableWindow(allowedFlags[SONG_LINEARSLIDES]);
+ m_CheckBox2.EnableWindow(allowedFlags[SONG_FASTVOLSLIDES]);
+ m_CheckBox3.EnableWindow(allowedFlags[SONG_ITOLDEFFECTS]);
+ m_CheckBox4.EnableWindow(allowedFlags[SONG_ITCOMPATGXX]);
+ m_CheckBox5.EnableWindow(allowedFlags[SONG_EXFILTERRANGE]);
+ m_CheckBoxPT1x.EnableWindow(allowedFlags[SONG_PT1XMODE]);
// -> CODE#0023
// -> DESC="IT project files (.itp)"
Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp 2012-08-05 18:06:20 UTC (rev 1339)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp 2012-08-05 18:32:31 UTC (rev 1340)
@@ -324,7 +324,8 @@
fwrite(&id, 1, sizeof(id), f);
// channel config data
- for(i=0; i<m_nChannels; i++){
+ for(i=0; i<m_nChannels; i++)
+ {
id = ChnSettings[i].nPan;
fwrite(&id, 1, sizeof(id), f);
id = ChnSettings[i].dwFlags;
Modified: trunk/OpenMPT/soundlib/ModChannel.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModChannel.cpp 2012-08-05 18:06:20 UTC (rev 1339)
+++ trunk/OpenMPT/soundlib/ModChannel.cpp 2012-08-05 18:32:31 UTC (rev 1340)
@@ -21,7 +21,7 @@
pModSample = nullptr;
pModInstrument = nullptr;
nPortamentoDest = 0;
- nCommand = 0;
+ nCommand = CMD_NONE;
nPatternLoopCount = 0;
nPatternLoop = 0;
nFadeOutVol = 0;
Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp 2012-08-05 18:06:20 UTC (rev 1339)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp 2012-08-05 18:32:31 UTC (rev 1340)
@@ -550,7 +550,7 @@
//---------------------------------------------------------------------------------------
{
// Effect translation LUT
- static const uint8 amEffTrans[] =
+ static const ModCommand::COMMAND amEffTrans[] =
{
CMD_ARPEGGIO, CMD_PORTAMENTOUP, CMD_PORTAMENTODOWN, CMD_TONEPORTAMENTO,
CMD_VIBRATO, CMD_TONEPORTAVOL, CMD_VIBRATOVOL, CMD_TREMOLO,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
