Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[320] trunk/OpenMPT
|
From: <sag...@us...> - 2009-08-12 21:17:48
|
Revision: 320
http://modplug.svn.sourceforge.net/modplug/?rev=320&view=rev
Author: saga-games
Date: 2009-08-12 21:17:36 +0000 (Wed, 12 Aug 2009)
Log Message:
-----------
[Fix] Pattern Editor: Show "offset" and "velocity" volume commands in default color instead of "pitch" color
[Fix] Menus: Added the correct shortcut keys again and replaced the last(?) remaining "Midi" labels by "MIDI"
[Imp] Keymaps: Added parameter control to DE_jojo.mkb
[Fix] S3M Saver: Set the stereo flag
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Draw_pat.cpp
trunk/OpenMPT/mptrack/InputHandler.cpp
trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb
trunk/OpenMPT/soundlib/Load_s3m.cpp
Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp 2009-08-10 16:08:26 UTC (rev 319)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp 2009-08-12 21:17:36 UTC (rev 320)
@@ -569,9 +569,9 @@
const ORDERINDEX startOrder = static_cast<ORDERINDEX>(SendCtrlMessage(CTRLMSG_GETCURRENTORDER));
if(startOrder > 0)
{
- ORDERINDEX prevOrder = startOrder - 1;
+ ORDERINDEX prevOrder;
+ prevOrder = pSndFile->Order.GetPreviousOrderIgnoringSkips(startOrder);
//Skip +++ items
- while(prevOrder > 0 && pSndFile->Order[prevOrder] == pSndFile->Order.GetIgnoreIndex()) --prevOrder;
if(startOrder < pSndFile->Order.size() && pSndFile->Order[startOrder] == m_nPattern)
{
@@ -617,11 +617,10 @@
UINT nNextPat = m_nPattern;
BOOL bNextPatFound = FALSE;
const ORDERINDEX startOrder= static_cast<ORDERINDEX>(SendCtrlMessage(CTRLMSG_GETCURRENTORDER));
- ORDERINDEX nNextOrder = 1 + startOrder;
-
+ ORDERINDEX nNextOrder;
+ nNextOrder = pSndFile->Order.GetNextOrderIgnoringSkips(startOrder);
//Ignore skip items(+++) from sequence.
const ORDERINDEX ordCount = pSndFile->Order.GetCount();
- while(nNextOrder < ordCount && pSndFile->Order[nNextOrder] == pSndFile->Order.GetIgnoreIndex()) nNextOrder++;
if ((nNextOrder < ordCount) && (pSndFile->Order[startOrder] == m_nPattern))
{
@@ -917,9 +916,11 @@
case VOLCMD_TONEPORTAMENTO:
case VOLCMD_PORTAUP:
case VOLCMD_PORTADOWN:
+ tx_col = MODCOLOR_PITCH;
+ break;
case VOLCMD_VELOCITY: //rewbs.velocity
case VOLCMD_OFFSET: //rewbs.volOff
- tx_col = MODCOLOR_PITCH;
+ // default color
break;
}
}
Modified: trunk/OpenMPT/mptrack/InputHandler.cpp
===================================================================
--- trunk/OpenMPT/mptrack/InputHandler.cpp 2009-08-10 16:08:26 UTC (rev 319)
+++ trunk/OpenMPT/mptrack/InputHandler.cpp 2009-08-12 21:17:36 UTC (rev 320)
@@ -387,57 +387,57 @@
switch(id)
{
- case FILENEW: s="New\t"; c=kcFileNew; break;
- case ID_FILE_OPEN: s="Open...\t"; c=kcFileOpen; break;
- case ID_FILE_CLOSE: s="Close\t"; c=kcFileClose; break;
- case ID_FILE_SAVE: s="Save\t"; c=kcFileSave; break;
- case ID_FILE_SAVE_AS: s="Save As...\t"; c=kcFileSaveAs; break;
- case ID_FILE_SAVEASWAVE: s="Save as Wave...\t"; c=kcFileSaveAsWave; break;
- case ID_FILE_SAVEASMP3: s="Save as MP3...\t"; c=kcFileSaveAsMP3; break;
- case ID_FILE_SAVEMIDI: s="Export as Midi...\t"; c=kcFileSaveMidi; break;
- case ID_FILE_SAVECOMPAT: s="Compatibility Export...\t"; c=kcFileExportCompat; break;
- case ID_IMPORT_MIDILIB: s="Import MIDI Library...\t"; c=kcFileImportMidiLib; break;
- case ID_ADD_SOUNDBANK: s="Add Sound Bank...\t"; c=kcFileAddSoundBank; break;
+ case FILENEW: s="&New\t"; c=kcFileNew; break;
+ case ID_FILE_OPEN: s="&Open...\t"; c=kcFileOpen; break;
+ case ID_FILE_CLOSE: s="&Close\t"; c=kcFileClose; break;
+ case ID_FILE_SAVE: s="&Save\t"; c=kcFileSave; break;
+ case ID_FILE_SAVE_AS: s="Save &As...\t"; c=kcFileSaveAs; break;
+ case ID_FILE_SAVEASWAVE: s="Save as &Wave...\t"; c=kcFileSaveAsWave; break;
+ case ID_FILE_SAVEASMP3: s="Save as M&P3...\t"; c=kcFileSaveAsMP3; break;
+ case ID_FILE_SAVEMIDI: s="Export as M&IDI...\t"; c=kcFileSaveMidi; break;
+ case ID_FILE_SAVECOMPAT: s="Compatibility &Export...\t"; c=kcFileExportCompat; break;
+ case ID_IMPORT_MIDILIB: s="Import &MIDI Library...\t"; c=kcFileImportMidiLib; break;
+ 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_STOP: s="Stop\t"; c=kcStopSong; break;
- case ID_PLAYER_PAUSE: s="Pause\t"; c=kcPauseSong; break;
- case ID_MIDI_RECORD: s="Midi Record\t"; c=kcMidiRecord; break;
- case ID_ESTIMATESONGLENGTH: s="Estimate Song Length\t"; c=kcEstimateSongLength; break;
- case ID_APPROX_BPM: s="Approx. real BPM\t"; c=kcApproxRealBPM; 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_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;
+ case ID_ESTIMATESONGLENGTH: s="&Estimate Song Length\t"; c=kcEstimateSongLength; break;
+ case ID_APPROX_BPM: s="Approx. real &BPM\t"; c=kcApproxRealBPM; break;
- case ID_EDIT_UNDO: s="Undo\t"; c=kcEditUndo; break;
- case ID_EDIT_CUT: s="Cut\t"; c=kcEditCut; break;
- case ID_EDIT_COPY: s="Copy\t"; c=kcEditCopy; break;
- case ID_EDIT_PASTE: s="Paste\t"; c=kcEditPaste; break;
- case ID_EDIT_PASTE_SPECIAL: s="Mix Paste\t"; c=kcEditMixPaste; break;
- case ID_EDIT_SELECT_ALL: s="Select All\t"; c=kcEditSelectAll; break;
- case ID_EDIT_FIND: s="Find\t"; c=kcEditFind; break;
- case ID_EDIT_FINDNEXT: s="Find Next\t"; c=kcEditFindNext; break;
+ case ID_EDIT_UNDO: s="&Undo\t"; c=kcEditUndo; break;
+ case ID_EDIT_CUT: s="Cu&t\t"; c=kcEditCut; break;
+ case ID_EDIT_COPY: s="&Copy\t"; c=kcEditCopy; break;
+ case ID_EDIT_PASTE: s="&Paste\t"; c=kcEditPaste; break;
+ case ID_EDIT_PASTE_SPECIAL: s="&Mix Paste\t"; c=kcEditMixPaste; break;
+ case ID_EDIT_SELECT_ALL: s="&Select All\t"; c=kcEditSelectAll; break;
+ case ID_EDIT_FIND: s="&Find\t"; c=kcEditFind; break;
+ case ID_EDIT_FINDNEXT: s="Find &Next\t"; c=kcEditFindNext; break;
- case ID_VIEW_GLOBALS: s="General\t"; c=kcViewGeneral; break;
- case ID_VIEW_SAMPLES: s="Samples\t"; c=kcViewSamples; break;
- case ID_VIEW_PATTERNS: s="Patterns\t"; c=kcViewPattern; break;
- case ID_VIEW_INSTRUMENTS: s="Instruments\t"; c=kcViewInstruments; break;
- case ID_VIEW_COMMENTS: s="Comments\t"; c=kcViewComments; break;
- case ID_VIEW_GRAPH: s="Graph\t"; c=kcViewGraph; break; //rewbs.graph
- case MAINVIEW: s="Main\t"; c=kcViewMain; break;
- case IDD_TREEVIEW: s="Tree\t"; c=kcViewTree; break;
- case ID_VIEW_OPTIONS: s="Setup...\t"; c=kcViewOptions; break;
- case ID_HELP: s="Contents (todo)"; c=kcHelp; break;
- case ID_PLUGIN_SETUP: s="Plugin Manager...\t"; c=kcViewAddPlugin; break;
- case ID_CHANNEL_MANAGER: s="Channel Manager...\t"; c=kcViewChannelManager; break;
- case ID_VIEW_SONGPROPERTIES:s="Song Properties...\t"; c=kcViewSongProperties; break; //rewbs.graph
- case ID_VIEW_MIDIMAPPING: s="MIDI mapping...\t"; c = kcViewMIDImapping; break;
+ case ID_VIEW_GLOBALS: s="&General\t"; c=kcViewGeneral; break;
+ case ID_VIEW_SAMPLES: s="&Samples\t"; c=kcViewSamples; break;
+ case ID_VIEW_PATTERNS: s="&Patterns\t"; c=kcViewPattern; break;
+ case ID_VIEW_INSTRUMENTS: s="&Instruments\t"; c=kcViewInstruments; break;
+ case ID_VIEW_COMMENTS: s="&Comments\t"; c=kcViewComments; break;
+ case ID_VIEW_GRAPH: s="G&raph\t"; c=kcViewGraph; break; //rewbs.graph
+ case MAINVIEW: s="&Main\t"; c=kcViewMain; break;
+ case IDD_TREEVIEW: s="&Tree\t"; c=kcViewTree; break;
+ case ID_VIEW_OPTIONS: s="S&etup...\t"; c=kcViewOptions; break;
+ case ID_HELP: s="C&ontents (todo)"; c=kcHelp; break;
+ case ID_PLUGIN_SETUP: s="Pl&ugin Manager...\t"; c=kcViewAddPlugin; break;
+ case ID_CHANNEL_MANAGER: s="Ch&annel Manager...\t"; c=kcViewChannelManager; break;
+ case ID_VIEW_SONGPROPERTIES:s="Song P&roperties...\t"; c=kcViewSongProperties; break; //rewbs.graph
+ case ID_VIEW_MIDIMAPPING: s="&MIDI mapping...\t"; c = kcViewMIDImapping; break;
-
-/*
- case ID_WINDOW_NEW: s="New Window\t"; c=kcWindowNew; break;
- case ID_WINDOW_CASCADE: s="Cascade\t"; c=kcWindowCascade; break;
- case ID_WINDOW_TILE_HORZ: s="Tile Horizontal\t"; c=kcWindowTileHorz; break;
- case ID_WINDOW_TILE_VERT: s="Tile Vertical\t"; c=kcWindowTileVert; break;
-*/
+
+ /*
+ case ID_WINDOW_NEW: s="&New Window\t"; c=kcWindowNew; break;
+ case ID_WINDOW_CASCADE: s="&Cascade\t"; c=kcWindowCascade; break;
+ case ID_WINDOW_TILE_HORZ: s="Tile &Horizontal\t"; c=kcWindowTileHorz; break;
+ case ID_WINDOW_TILE_VERT: s="Tile &Vertical\t"; c=kcWindowTileVert; break;
+ */
default: return "Unknown Item.";
}
Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb
===================================================================
--- trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb 2009-08-10 16:08:26 UTC (rev 319)
+++ trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb 2009-08-12 21:17:36 UTC (rev 320)
@@ -157,6 +157,8 @@
3:1200:0:220:1 //Note Cut: ZIRKUMFLEX (KeyDown)
3:1201:0:221:1 //Note Off: AKUT (KeyDown)
3:1791:0:219:1 //Note Fade: \xDF (KeyDown)
+3:1788:0:226:1 //Parameter control(MPTm only): < (KeyDown)
+3:1789:1:226:1 //Parameter control(smooth)(MPTm only): Shift+< (KeyDown)
//----( Pattern Context [bottom] - Ins Col (4) )------------
4:1202:0:96:1 //Set instrument digit 0: 0 (ZEHNERTASTATUR) (KeyDown)
Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp 2009-08-10 16:08:26 UTC (rev 319)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp 2009-08-12 21:17:36 UTC (rev 320)
@@ -292,7 +292,7 @@
// Global Volume
m_nDefaultGlobalVolume = psfh.globalvol << 2;
if ((!m_nDefaultGlobalVolume) || (m_nDefaultGlobalVolume > 256)) m_nDefaultGlobalVolume = 256;
- m_nSamplePreAmp = psfh.mastervol & 0x7F;
+ m_nSamplePreAmp = psfh.mastervol & 0x7F; // Bit 8 = Stereo (we always use stereo)
// Channels
m_nChannels = 4;
for (UINT ich=0; ich<32; ich++)
@@ -542,7 +542,8 @@
header[0x30] = m_nDefaultGlobalVolume >> 2;
header[0x31] = CLAMP(m_nDefaultSpeed, 1, 255);
header[0x32] = CLAMP(m_nDefaultTempo, 32, 255);
- header[0x33] = CLAMP(m_nSamplePreAmp, 0x10, 0x7F); // Stereo
+ header[0x33] = CLAMP(m_nSamplePreAmp, 0x10, 0x7F) | 0x80; // Bit 8 = Stereo
+ header[0x34] = 0x10; // 16 Channels for UltraClick removal
header[0x35] = 0xFC;
for (i=0; i<32; i++)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
