From: <sag...@us...> - 2012-07-17 21:08:22
|
Revision: 1328 http://modplug.svn.sourceforge.net/modplug/?rev=1328&view=rev Author: saga-games Date: 2012-07-17 21:08:15 +0000 (Tue, 17 Jul 2012) Log Message: ----------- [Int] Removed muParser files - we won't need those anymore (Sample Generator will be using Lua once I'm done with everything). [Int] Removed long unused files (mix graph, pattern randomizer) - we won't need those anymore Modified Paths: -------------- trunk/OpenMPT/mptrack/mptrack.rc trunk/OpenMPT/mptrack/mptrack_08.vcproj trunk/OpenMPT/mptrack/mptrack_10.vcxproj trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters trunk/OpenMPT/mptrack/resource.h Removed Paths: ------------- trunk/OpenMPT/mptrack/PatternRandomizer.cpp trunk/OpenMPT/mptrack/PatternRandomizer.h trunk/OpenMPT/mptrack/PatternRandomizerGUI.cpp trunk/OpenMPT/mptrack/PatternRandomizerGUI.h trunk/OpenMPT/mptrack/PatternRandomizerGUIEffect.cpp trunk/OpenMPT/mptrack/PatternRandomizerGUIEffect.h trunk/OpenMPT/mptrack/PatternRandomizerGUIInstrument.cpp trunk/OpenMPT/mptrack/PatternRandomizerGUIInstrument.h trunk/OpenMPT/mptrack/PatternRandomizerGUINote.cpp trunk/OpenMPT/mptrack/PatternRandomizerGUINote.h trunk/OpenMPT/mptrack/PatternRandomizerGUIVolCmd.cpp trunk/OpenMPT/mptrack/PatternRandomizerGUIVolCmd.h trunk/OpenMPT/muParser/ Deleted: trunk/OpenMPT/mptrack/PatternRandomizer.cpp =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizer.cpp 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizer.cpp 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,30 +0,0 @@ -#include "stdafx.h" -#include "mptrack.h" -#include ".\patternrandomizer.h" -#include ".\patternrandomizerGUI.h" -#include "mainfrm.h" -#include "moddoc.h" -#include "dlg_misc.h" -#include "globals.h" -#include ".\view_pat.h" - -CPatternRandomizer::CPatternRandomizer(CViewPattern* viewPat) -{ - m_pViewPattern = viewPat; - m_pRandomizerGUI = new CPatternRandomizerGUI(this, (CWnd*) m_pViewPattern); -} - -CPatternRandomizer::~CPatternRandomizer(void) -{ - delete m_pRandomizerGUI; -} - -bool CPatternRandomizer::showGUI() -{ - return m_pRandomizerGUI->openEditor(); -} - -bool CPatternRandomizer::isGUIVisible() -{ - return m_pRandomizerGUI->isVisible(); -} \ No newline at end of file Deleted: trunk/OpenMPT/mptrack/PatternRandomizer.h =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizer.h 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizer.h 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,21 +0,0 @@ -#pragma once - -class CViewPattern; -class CPatternRandomizerGUI; - -class CPatternRandomizer -{ -public: - CPatternRandomizer(CViewPattern* viewPat); - ~CPatternRandomizer(void); - bool showGUI(void); - bool isGUIVisible(void); - -private: - CPatternRandomizerGUI* m_pRandomizerGUI; - CViewPattern* m_pViewPattern; - - bool m_bRandomizeNotes, m_bRandomizeInstruments, - m_bRandomizeVolCmds, m_bRandomizeEffects; - -}; Deleted: trunk/OpenMPT/mptrack/PatternRandomizerGUI.cpp =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizerGUI.cpp 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizerGUI.cpp 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,128 +0,0 @@ -// PatternRandomizerGUI.cpp : implementation file -// -#include "stdafx.h" -#include "mptrack.h" -#include ".\patternrandomizergui.h" - - -// CPatternRandomizerGUI dialog - -IMPLEMENT_DYNAMIC(CPatternRandomizerGUI, CDialog) -CPatternRandomizerGUI::CPatternRandomizerGUI(CPatternRandomizer *patRandom, CWnd* pParent /*=NULL*/) - : CDialog(CPatternRandomizerGUI::IDD, pParent) -{ - m_pParentWindow = pParent; - m_pPatternRandomizer = patRandom; - m_pCurrentTab = NULL; - Create(IDD_PATTERNRANDOMIZER, m_pParentWindow); -} - -CPatternRandomizerGUI::~CPatternRandomizerGUI() -{ -} - -void CPatternRandomizerGUI::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - DDX_Control(pDX, IDC_TAB1, m_RandomizerTabs); -} - - -BEGIN_MESSAGE_MAP(CPatternRandomizerGUI, CDialog) - ON_NOTIFY(TCN_SELCHANGE, IDC_TAB1, OnRandomiserTabChange) - ON_WM_CLOSE() -END_MESSAGE_MAP() - - -// CPatternRandomizerGUI message handlers - -BOOL CPatternRandomizerGUI::OnInitDialog() -//---------------------------------------- -{ - CDialog::OnInitDialog(); - - CRect rect; - GetDlgItem(IDC_RANDOM_PLACEHOLDER)->GetWindowRect(rect); - int hOff = 8, vOff = 86; - //int width = 100, height = 200; - - m_RandomizerNote.Create(CPatternRandomizerGUINote::IDD, (CWnd*)this); - m_RandomizerNote.MoveWindow(hOff, vOff, rect.Width(), rect.Height()); - m_RandomizerInstrument.Create(CPatternRandomizerGUIInstrument::IDD, (CWnd*)this); - m_RandomizerInstrument.MoveWindow(hOff, vOff, rect.Width(), rect.Height()); - m_RandomizerVolCmd.Create(CPatternRandomizerGUIVolCmd::IDD, (CWnd*)this); - m_RandomizerVolCmd.MoveWindow(hOff, vOff, rect.Width(), rect.Height()); - m_RandomizerEffect.Create(CPatternRandomizerGUIEffect::IDD, (CWnd*)this); - m_RandomizerEffect.MoveWindow(hOff, vOff, rect.Width(), rect.Height()); - -/* m_RandomizerNote.Create(CPatternRandomizerGUINote::IDD, (CWnd*)this); - m_RandomizerNote.MoveWindow(hOff, vOff, width, height); - m_RandomizerInstrument.Create(CPatternRandomizerGUIInstrument::IDD, (CWnd*)this); - m_RandomizerInstrument.MoveWindow(hOff, vOff, width, height); - m_RandomizerVolCmd.Create(CPatternRandomizerGUIVolCmd::IDD, (CWnd*)this); - m_RandomizerVolCmd.MoveWindow(hOff, vOff, width, height); - m_RandomizerEffect.Create(CPatternRandomizerGUIEffect::IDD, (CWnd*)this); - m_RandomizerEffect.MoveWindow(hOff, vOff, width, height); -*/ - m_RandomizerTabs.InsertItem(tab_rand_notes, "Notes"); - m_RandomizerTabs.InsertItem(tab_rand_instruments, "Instruments"); - m_RandomizerTabs.InsertItem(tab_rand_volcmds, "Vol Commands"); - m_RandomizerTabs.InsertItem(tab_rand_effects, "Effects"); - - setTab(&m_RandomizerNote); - return TRUE; -} - -bool CPatternRandomizerGUI::openEditor() { -//---------------------------------- - ShowWindow(SW_SHOW); - return TRUE; -} - -bool CPatternRandomizerGUI::isVisible() { -//---------------------------------- - return IsWindowVisible() ? true : false; -} - - -void CPatternRandomizerGUI::setTab(CWnd *newTab) { -//------------------------------------------------ - if (m_pCurrentTab != NULL) { - m_pCurrentTab->ShowWindow(SW_HIDE); - } - m_pCurrentTab = newTab; - //m_pCurrentTab->SetWindowPos(&CWnd::wndTop, 0, 0, 0, 0, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE); - m_pCurrentTab->ShowWindow(SW_SHOW); -} - - -void CPatternRandomizerGUI::OnRandomiserTabChange(NMHDR* /*pNMHDR*/, LRESULT *pResult) -//-------------------------------------------------------------------------------- -{ - int nActiveTab = m_RandomizerTabs.GetCurSel(); - - switch(nActiveTab) { - case tab_rand_notes: - setTab(&m_RandomizerNote); - break; - case tab_rand_instruments: - setTab(&m_RandomizerInstrument); - break; - case tab_rand_volcmds: - setTab(&m_RandomizerVolCmd); - break; - case tab_rand_effects: - setTab(&m_RandomizerEffect); - break; - default: - ASSERT(false); - } - - *pResult = 0; -} - -void CPatternRandomizerGUI::OnClose() -{ - // TODO: Add your message handler code here and/or call default - CDialog::OnClose(); -} Deleted: trunk/OpenMPT/mptrack/PatternRandomizerGUI.h =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizerGUI.h 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizerGUI.h 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,54 +0,0 @@ -#pragma once -#include "afxcmn.h" -#include "PatternRandomizerGUINote.h" -#include "PatternRandomizerGUIInstrument.h" -#include "PatternRandomizerGUIVolCmd.h" -#include "PatternRandomizerGUIEffect.h" - -class CPatternRandomizer; - - -// CPatternRandomizerGUI dialog -enum { - tab_rand_notes = 0, - tab_rand_instruments, - tab_rand_volcmds, - tab_rand_effects, -}; - -class CPatternRandomizerGUI : public CDialog -{ - DECLARE_DYNAMIC(CPatternRandomizerGUI) - -public: - CPatternRandomizerGUI(CPatternRandomizer* patRandom, CWnd* pParent = NULL); // standard constructor - virtual ~CPatternRandomizerGUI(); - - bool openEditor(); - bool isVisible(); - -// Dialog Data - enum { IDD = IDD_PATTERNRANDOMIZER }; - -protected: - CWnd* m_pParentWindow; - CPatternRandomizer* m_pPatternRandomizer; - - CWnd* m_pCurrentTab; - CPatternRandomizerGUINote m_RandomizerNote; - CPatternRandomizerGUIInstrument m_RandomizerInstrument; - CPatternRandomizerGUIEffect m_RandomizerEffect; - CPatternRandomizerGUIVolCmd m_RandomizerVolCmd; - CTabCtrl m_RandomizerTabs; - - void setTab(CWnd *newTab); - - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - virtual BOOL OnInitDialog(); - DECLARE_MESSAGE_MAP() - - -public: - afx_msg void OnRandomiserTabChange(NMHDR *pNMHDR, LRESULT *pResult); - afx_msg void OnClose(); -}; Deleted: trunk/OpenMPT/mptrack/PatternRandomizerGUIEffect.cpp =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizerGUIEffect.cpp 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizerGUIEffect.cpp 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,31 +0,0 @@ -// PatternRandomizerGUIEffect.cpp : implementation file -// - -#include "stdafx.h" -#include "mptrack.h" -#include "PatternRandomizerGUIEffect.h" - - -// CPatternRandomizerGUIEffect dialog - -IMPLEMENT_DYNAMIC(CPatternRandomizerGUIEffect, CDialog) -CPatternRandomizerGUIEffect::CPatternRandomizerGUIEffect(CWnd* pParent /*=NULL*/) - : CDialog(CPatternRandomizerGUIEffect::IDD, pParent) -{ -} - -CPatternRandomizerGUIEffect::~CPatternRandomizerGUIEffect() -{ -} - -void CPatternRandomizerGUIEffect::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); -} - - -BEGIN_MESSAGE_MAP(CPatternRandomizerGUIEffect, CDialog) -END_MESSAGE_MAP() - - -// CPatternRandomizerGUIEffect message handlers Deleted: trunk/OpenMPT/mptrack/PatternRandomizerGUIEffect.h =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizerGUIEffect.h 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizerGUIEffect.h 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,21 +0,0 @@ -#pragma once - - -// CPatternRandomizerGUIEffect dialog - -class CPatternRandomizerGUIEffect : public CDialog -{ - DECLARE_DYNAMIC(CPatternRandomizerGUIEffect) - -public: - CPatternRandomizerGUIEffect(CWnd* pParent = NULL); // standard constructor - virtual ~CPatternRandomizerGUIEffect(); - -// Dialog Data - enum { IDD = IDD_PATTERNRANDOMIZER_EFFECT }; - -protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - - DECLARE_MESSAGE_MAP() -}; Deleted: trunk/OpenMPT/mptrack/PatternRandomizerGUIInstrument.cpp =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizerGUIInstrument.cpp 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizerGUIInstrument.cpp 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,38 +0,0 @@ -// PatternRandomizerGUIInstrument.cpp : implementation file -// - -#include "stdafx.h" -#include "mptrack.h" -#include "PatternRandomizerGUIInstrument.h" -#include ".\patternrandomizerguiinstrument.h" - - -// CPatternRandomizerGUIInstrument dialog - -IMPLEMENT_DYNAMIC(CPatternRandomizerGUIInstrument, CDialog) -CPatternRandomizerGUIInstrument::CPatternRandomizerGUIInstrument(CWnd* pParent /*=NULL*/) - : CDialog(CPatternRandomizerGUIInstrument::IDD, pParent) -{ -} - -CPatternRandomizerGUIInstrument::~CPatternRandomizerGUIInstrument() -{ -} - -void CPatternRandomizerGUIInstrument::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); -} - - -BEGIN_MESSAGE_MAP(CPatternRandomizerGUIInstrument, CDialog) - ON_BN_CLICKED(65535, OnBnClicked65535) -END_MESSAGE_MAP() - - -// CPatternRandomizerGUIInstrument message handlers - -void CPatternRandomizerGUIInstrument::OnBnClicked65535() -{ - // TODO: Add your control notification handler code here -} Deleted: trunk/OpenMPT/mptrack/PatternRandomizerGUIInstrument.h =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizerGUIInstrument.h 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizerGUIInstrument.h 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,23 +0,0 @@ -#pragma once - - -// CPatternRandomizerGUIInstrument dialog - -class CPatternRandomizerGUIInstrument : public CDialog -{ - DECLARE_DYNAMIC(CPatternRandomizerGUIInstrument) - -public: - CPatternRandomizerGUIInstrument(CWnd* pParent = NULL); // standard constructor - virtual ~CPatternRandomizerGUIInstrument(); - -// Dialog Data - enum { IDD = IDD_PATTERNRANDOMIZER_INSTRUMENT }; - -protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - - DECLARE_MESSAGE_MAP() -public: - afx_msg void OnBnClicked65535(); -}; Deleted: trunk/OpenMPT/mptrack/PatternRandomizerGUINote.cpp =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizerGUINote.cpp 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizerGUINote.cpp 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,31 +0,0 @@ -// PatternRandomizerGUINote.cpp : implementation file -// - -#include "stdafx.h" -#include "mptrack.h" -#include "PatternRandomizerGUINote.h" - - -// CPatternRandomizerGUINote dialog - -IMPLEMENT_DYNAMIC(CPatternRandomizerGUINote, CDialog) -CPatternRandomizerGUINote::CPatternRandomizerGUINote(CWnd* pParent /*=NULL*/) - : CDialog(CPatternRandomizerGUINote::IDD, pParent) -{ -} - -CPatternRandomizerGUINote::~CPatternRandomizerGUINote() -{ -} - -void CPatternRandomizerGUINote::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); -} - - -BEGIN_MESSAGE_MAP(CPatternRandomizerGUINote, CDialog) -END_MESSAGE_MAP() - - -// CPatternRandomizerGUINote message handlers Deleted: trunk/OpenMPT/mptrack/PatternRandomizerGUINote.h =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizerGUINote.h 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizerGUINote.h 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,21 +0,0 @@ -#pragma once - - -// CPatternRandomizerGUINote dialog - -class CPatternRandomizerGUINote : public CDialog -{ - DECLARE_DYNAMIC(CPatternRandomizerGUINote) - -public: - CPatternRandomizerGUINote(CWnd* pParent = NULL); // standard constructor - virtual ~CPatternRandomizerGUINote(); - -// Dialog Data - enum { IDD = IDD_PATTERNRANDOMIZER_NOTE }; - -protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - - DECLARE_MESSAGE_MAP() -}; Deleted: trunk/OpenMPT/mptrack/PatternRandomizerGUIVolCmd.cpp =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizerGUIVolCmd.cpp 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizerGUIVolCmd.cpp 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,31 +0,0 @@ -// PatternRandomizerGUIVolCmd.cpp : implementation file -// - -#include "stdafx.h" -#include "mptrack.h" -#include "PatternRandomizerGUIVolCmd.h" - - -// CPatternRandomizerGUIVolCmd dialog - -IMPLEMENT_DYNAMIC(CPatternRandomizerGUIVolCmd, CDialog) -CPatternRandomizerGUIVolCmd::CPatternRandomizerGUIVolCmd(CWnd* pParent /*=NULL*/) - : CDialog(CPatternRandomizerGUIVolCmd::IDD, pParent) -{ -} - -CPatternRandomizerGUIVolCmd::~CPatternRandomizerGUIVolCmd() -{ -} - -void CPatternRandomizerGUIVolCmd::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); -} - - -BEGIN_MESSAGE_MAP(CPatternRandomizerGUIVolCmd, CDialog) -END_MESSAGE_MAP() - - -// CPatternRandomizerGUIVolCmd message handlers Deleted: trunk/OpenMPT/mptrack/PatternRandomizerGUIVolCmd.h =================================================================== --- trunk/OpenMPT/mptrack/PatternRandomizerGUIVolCmd.h 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/PatternRandomizerGUIVolCmd.h 2012-07-17 21:08:15 UTC (rev 1328) @@ -1,21 +0,0 @@ -#pragma once - - -// CPatternRandomizerGUIVolCmd dialog - -class CPatternRandomizerGUIVolCmd : public CDialog -{ - DECLARE_DYNAMIC(CPatternRandomizerGUIVolCmd) - -public: - CPatternRandomizerGUIVolCmd(CWnd* pParent = NULL); // standard constructor - virtual ~CPatternRandomizerGUIVolCmd(); - -// Dialog Data - enum { IDD = IDD_PATTERNRANDOMIZER_VOLCMD }; - -protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - - DECLARE_MESSAGE_MAP() -}; Modified: trunk/OpenMPT/mptrack/mptrack.rc =================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/mptrack.rc 2012-07-17 21:08:15 UTC (rev 1328) @@ -1553,78 +1553,6 @@ DEFPUSHBUTTON "OK",IDOK,90,60,32,14 END -IDD_PATTERNRANDOMIZER DIALOGEX 0, 0, 246, 255 -STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_TOOLWINDOW | WS_EX_APPWINDOW -CAPTION "Pattern Randomizer - NOT YET FUNCTIONAL" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - PUSHBUTTON "Load",IDC_BUTTON1,112,13,30,14 - PUSHBUTTON "Save",IDC_BUTTON2,143,13,30,14 - EDITTEXT IDC_EDIT1,9,13,99,14,ES_AUTOHSCROLL - GROUPBOX "Profile:",IDC_STATIC,4,3,238,35 - CONTROL "",IDC_TAB1,"SysTabControl32",0x0,4,40,238,190 - PUSHBUTTON "Apply",IDC_APPLY,192,235,50,14 - LTEXT "Static",IDC_RANDOM_PLACEHOLDER,6,53,232,175 -END - -IDD_PATTERNRANDOMIZER_NOTE DIALOGEX 0, 0, 235, 172 -STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "",IDC_STATIC,5,5,224,164 - CONTROL "Randomize Notes",IDC_RANDOMIZE_NOTE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,4,72,10 - CONTROL "Range",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,11,17,37,10 - CONTROL "Use the following notes:",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,11,29,91,10 - CONTROL "",IDC_LIST2,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,11,41,210,83 - EDITTEXT IDC_EDIT1,48,16,20,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "semitones around current note.",IDC_STATIC,71,18,98,8 - GROUPBOX "Include random...",IDC_STATIC,11,130,107,33 - CONTROL "Notes",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,141,35,10 - CONTROL "Note offs",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,150,45,10 - CONTROL "Note cuts",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,150,47,10 - CONTROL "Blank rows",IDC_CHECK8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,140,51,10 - GROUPBOX "Overwrite existing...",IDC_STATIC,117,130,105,33 - CONTROL "Notes",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,141,35,10 - CONTROL "Note offs",IDC_CHECK10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,150,45,10 - CONTROL "Note cuts",IDC_CHECK11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,150,44,10 - CONTROL "Blank rows",IDC_CHECK12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,140,49,10 -END - -IDD_PATTERNRANDOMIZER_INSTRUMENT DIALOGEX 0, 0, 236, 172 -STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "",-1,5,5,225,164 - CONTROL "Randomize Instruments",IDC_RANDOMIZE_NOTE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,4,89,10 - LTEXT "Use the following instruments:",-1,12,18,94,8 - LISTBOX IDC_LIST1,11,30,125,135,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP -END - -IDD_PATTERNRANDOMIZER_VOLCMD DIALOGEX 0, 0, 235, 172 -STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "",IDC_STATIC,5,5,224,164 - CONTROL "Use existing commands.",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,14,27,92,10 - CONTROL "Use the following:",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,14,38,72,10 - GROUPBOX "Command types:",IDC_STATIC,11,16,211,147 - LISTBOX IDC_LIST1,15,49,91,108,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO1,122,49,96,96,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Min:",IDC_STATIC,136,69,14,8 - CONTROL "Randomize Volume Commands",IDC_RANDOMIZE_NOTE_ENABLE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,4,113,10 - EDITTEXT IDC_EDIT2,152,67,20,12,ES_AUTOHSCROLL - LTEXT "Max:",IDC_STATIC,178,69,16,8 - EDITTEXT IDC_EDIT3,195,67,20,12,ES_AUTOHSCROLL - GROUPBOX "Command parameters:",IDC_STATIC,115,16,107,147 - CONTROL "Radio1",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,123,68,10,10 - CONTROL "Radio1",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,123,83,10,10 - EDITTEXT IDC_EDIT4,136,82,17,12,ES_AUTOHSCROLL - LTEXT "around current",IDC_STATIC,156,84,49,8 -END - IDD_ADDSILENCE DIALOGEX 0, 0, 184, 82 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Add Silence / Resize" @@ -1642,29 +1570,7 @@ CONTROL "Resize to",IDC_RADIO_RESIZETO,"Button",BS_AUTORADIOBUTTON,12,60,102,8 END -IDD_PATTERNRANDOMIZER_EFFECT DIALOGEX 0, 0, 235, 172 -STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "",IDC_STATIC,5,5,224,164 - CONTROL "Use existing effects.",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,14,27,79,10 - CONTROL "Use the following effects:",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,14,38,95,10 - GROUPBOX "Effect types:",IDC_STATIC,11,16,211,147 - LISTBOX IDC_LIST1,15,49,91,108,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO1,122,49,96,96,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Min:",IDC_STATIC,136,69,14,8 - CONTROL "Randomize Effects",IDC_RANDOMIZE_NOTE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,4,75,10 - EDITTEXT IDC_EDIT2,152,67,20,12,ES_AUTOHSCROLL - LTEXT "Max:",IDC_STATIC,178,69,16,8 - EDITTEXT IDC_EDIT3,195,67,20,12,ES_AUTOHSCROLL - GROUPBOX "Effect parameters:",IDC_STATIC,115,16,107,147 - CONTROL "Radio1",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,123,68,10,10 - CONTROL "Radio1",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,123,83,10,10 - EDITTEXT IDC_EDIT4,136,82,17,12,ES_AUTOHSCROLL - LTEXT "around current",IDC_STATIC,156,84,49,8 -END - ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -1925,33 +1831,6 @@ TOPMARGIN, 4 END - IDD_PATTERNRANDOMIZER, DIALOG - BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 242 - TOPMARGIN, 3 - BOTTOMMARGIN, 249 - END - - IDD_PATTERNRANDOMIZER_NOTE, DIALOG - BEGIN - RIGHTMARGIN, 229 - BOTTOMMARGIN, 169 - END - - IDD_PATTERNRANDOMIZER_INSTRUMENT, DIALOG - BEGIN - RIGHTMARGIN, 230 - TOPMARGIN, 4 - BOTTOMMARGIN, 169 - END - - IDD_PATTERNRANDOMIZER_VOLCMD, DIALOG - BEGIN - RIGHTMARGIN, 229 - BOTTOMMARGIN, 169 - END - IDD_ADDSILENCE, DIALOG BEGIN LEFTMARGIN, 7 @@ -1959,12 +1838,6 @@ TOPMARGIN, 7 BOTTOMMARGIN, 75 END - - IDD_PATTERNRANDOMIZER_EFFECT, DIALOG - BEGIN - RIGHTMARGIN, 229 - BOTTOMMARGIN, 169 - END END #endif // APSTUDIO_INVOKED Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj =================================================================== --- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2012-07-17 21:08:15 UTC (rev 1328) @@ -609,134 +609,6 @@ > </File> <Filter - Name="PatternRandomizer" - > - <File - RelativePath=".\PatternRandomizer.cpp" - > - </File> - <File - RelativePath=".\PatternRandomizer.h" - > - </File> - <File - RelativePath=".\PatternRandomizerGUI.cpp" - > - </File> - <File - RelativePath=".\PatternRandomizerGUI.h" - > - </File> - <File - RelativePath=".\PatternRandomizerGUIEffect.cpp" - > - </File> - <File - RelativePath=".\PatternRandomizerGUIEffect.h" - > - </File> - <File - RelativePath=".\PatternRandomizerGUIInstrument.cpp" - > - </File> - <File - RelativePath=".\PatternRandomizerGUIInstrument.h" - > - </File> - <File - RelativePath=".\PatternRandomizerGUINote.cpp" - > - </File> - <File - RelativePath=".\PatternRandomizerGUINote.h" - > - </File> - <File - RelativePath=".\PatternRandomizerGUIVolCmd.cpp" - > - </File> - <File - RelativePath=".\PatternRandomizerGUIVolCmd.h" - > - </File> - </Filter> - <Filter - Name="MixGraph" - > - <File - RelativePath=".\ChannelNode.cpp" - > - </File> - <File - RelativePath=".\ChannelNode.h" - > - </File> - <File - RelativePath=".\ctrl_graph.cpp" - > - </File> - <File - RelativePath=".\ctrl_graph.h" - > - </File> - <File - RelativePath=".\EffectNode.cpp" - > - </File> - <File - RelativePath=".\EffectNode.h" - > - </File> - <File - RelativePath=".\FinalNode.cpp" - > - </File> - <File - RelativePath=".\FinalNode.h" - > - </File> - <File - RelativePath=".\Graph.cpp" - > - </File> - <File - RelativePath=".\Graph.h" - > - </File> - <File - RelativePath=".\InstrumentNode.cpp" - > - </File> - <File - RelativePath=".\InstrumentNode.h" - > - </File> - <File - RelativePath=".\Node.cpp" - > - </File> - <File - RelativePath=".\Node.h" - > - </File> - <File - RelativePath=".\Vertex.cpp" - > - </File> - <File - RelativePath=".\Vertex.h" - > - </File> - <File - RelativePath=".\view_graph.cpp" - > - </File> - <File - RelativePath=".\view_graph.h" - > - </File> - </Filter> - <Filter Name="Tuning" > <File Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj =================================================================== --- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2012-07-17 21:08:15 UTC (rev 1328) @@ -277,21 +277,6 @@ <ClCompile Include="vstplug.cpp" /> <ClCompile Include="..\soundlib\Waveform.cpp" /> <ClCompile Include="..\soundlib\WindowedFIR.cpp" /> - <ClCompile Include="PatternRandomizer.cpp" /> - <ClCompile Include="PatternRandomizerGUI.cpp" /> - <ClCompile Include="PatternRandomizerGUIEffect.cpp" /> - <ClCompile Include="PatternRandomizerGUIInstrument.cpp" /> - <ClCompile Include="PatternRandomizerGUINote.cpp" /> - <ClCompile Include="PatternRandomizerGUIVolCmd.cpp" /> - <ClCompile Include="ChannelNode.cpp" /> - <ClCompile Include="ctrl_graph.cpp" /> - <ClCompile Include="EffectNode.cpp" /> - <ClCompile Include="FinalNode.cpp" /> - <ClCompile Include="Graph.cpp" /> - <ClCompile Include="InstrumentNode.cpp" /> - <ClCompile Include="Node.cpp" /> - <ClCompile Include="Vertex.cpp" /> - <ClCompile Include="view_graph.cpp" /> <ClCompile Include="..\soundlib\tuning.cpp" /> <ClCompile Include="..\soundlib\tuningbase.cpp" /> <ClCompile Include="..\soundlib\tuningCollection.cpp" /> @@ -360,22 +345,7 @@ <ClInclude Include="MIDIMapping.h" /> <ClInclude Include="PatternClipboard.h" /> <ClInclude Include="PatternCursor.h" /> - <ClInclude Include="PatternRandomizer.h" /> - <ClInclude Include="PatternRandomizerGUI.h" /> - <ClInclude Include="PatternRandomizerGUIEffect.h" /> - <ClInclude Include="PatternRandomizerGUIInstrument.h" /> - <ClInclude Include="PatternRandomizerGUINote.h" /> - <ClInclude Include="PatternRandomizerGUIVolCmd.h" /> - <ClInclude Include="ChannelNode.h" /> - <ClInclude Include="ctrl_graph.h" /> - <ClInclude Include="EffectNode.h" /> - <ClInclude Include="FinalNode.h" /> - <ClInclude Include="Graph.h" /> - <ClInclude Include="InstrumentNode.h" /> - <ClInclude Include="Node.h" /> <ClInclude Include="SelectPluginDialog.h" /> - <ClInclude Include="Vertex.h" /> - <ClInclude Include="view_graph.h" /> <ClInclude Include="AbstractVstEditor.h" /> <ClInclude Include="AutoSaver.h" /> <ClInclude Include="ChannelManagerDlg.h" /> Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters =================================================================== --- trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2012-07-17 21:08:15 UTC (rev 1328) @@ -136,21 +136,6 @@ <ClCompile Include="globals.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="ChannelNode.cpp"> - <Filter>Source Files\MixGraph</Filter> - </ClCompile> - <ClCompile Include="ctrl_graph.cpp"> - <Filter>Source Files\MixGraph</Filter> - </ClCompile> - <ClCompile Include="EffectNode.cpp"> - <Filter>Source Files\MixGraph</Filter> - </ClCompile> - <ClCompile Include="FinalNode.cpp"> - <Filter>Source Files\MixGraph</Filter> - </ClCompile> - <ClCompile Include="Graph.cpp"> - <Filter>Source Files\MixGraph</Filter> - </ClCompile> <ClCompile Include="HyperEdit.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -163,9 +148,6 @@ <ClCompile Include="InputHandler.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="InstrumentNode.cpp"> - <Filter>Source Files\MixGraph</Filter> - </ClCompile> <ClCompile Include="..\soundlib\Message.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -208,24 +190,6 @@ <ClCompile Include="mod2midi.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="Node.cpp"> - <Filter>Source Files\MixGraph</Filter> - </ClCompile> - <ClCompile Include="PatternRandomizerGUI.cpp"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClCompile> - <ClCompile Include="PatternRandomizerGUIEffect.cpp"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClCompile> - <ClCompile Include="PatternRandomizerGUIInstrument.cpp"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClCompile> - <ClCompile Include="PatternRandomizerGUINote.cpp"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClCompile> - <ClCompile Include="PatternRandomizerGUIVolCmd.cpp"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClCompile> <ClCompile Include="..\soundlib\pattern.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -328,15 +292,6 @@ <ClCompile Include="PatternGotoDialog.cpp"> <Filter>Source Files\Dialogs</Filter> </ClCompile> - <ClCompile Include="PatternRandomizer.cpp"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClCompile> - <ClCompile Include="Vertex.cpp"> - <Filter>Source Files\MixGraph</Filter> - </ClCompile> - <ClCompile Include="view_graph.cpp"> - <Filter>Source Files\MixGraph</Filter> - </ClCompile> <ClCompile Include="..\soundlib\PlaybackEventer.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -516,27 +471,9 @@ <ClInclude Include="globals.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ChannelNode.h"> - <Filter>Source Files\MixGraph</Filter> - </ClInclude> - <ClInclude Include="ctrl_graph.h"> - <Filter>Source Files\MixGraph</Filter> - </ClInclude> - <ClInclude Include="EffectNode.h"> - <Filter>Source Files\MixGraph</Filter> - </ClInclude> - <ClInclude Include="FinalNode.h"> - <Filter>Source Files\MixGraph</Filter> - </ClInclude> - <ClInclude Include="Graph.h"> - <Filter>Source Files\MixGraph</Filter> - </ClInclude> <ClInclude Include="InputHandler.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="InstrumentNode.h"> - <Filter>Source Files\MixGraph</Filter> - </ClInclude> <ClInclude Include="mainbar.h"> <Filter>Header Files</Filter> </ClInclude> @@ -567,24 +504,6 @@ <ClInclude Include="..\soundlib\ModSequence.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="Node.h"> - <Filter>Source Files\MixGraph</Filter> - </ClInclude> - <ClInclude Include="PatternRandomizerGUIVolCmd.h"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClInclude> - <ClInclude Include="PatternRandomizerGUI.h"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClInclude> - <ClInclude Include="PatternRandomizerGUIEffect.h"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClInclude> - <ClInclude Include="PatternRandomizerGUIInstrument.h"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClInclude> - <ClInclude Include="PatternRandomizerGUINote.h"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClInclude> <ClInclude Include="..\soundlib\WindowedFIR.h"> <Filter>Header Files</Filter> </ClInclude> @@ -657,15 +576,6 @@ <ClInclude Include="PatternEditorDialogs.h"> <Filter>Header Files\Dialogs</Filter> </ClInclude> - <ClInclude Include="PatternRandomizer.h"> - <Filter>Source Files\PatternRandomizer</Filter> - </ClInclude> - <ClInclude Include="Vertex.h"> - <Filter>Source Files\MixGraph</Filter> - </ClInclude> - <ClInclude Include="view_graph.h"> - <Filter>Source Files\MixGraph</Filter> - </ClInclude> <ClInclude Include="ColourEdit.h"> <Filter>Header Files</Filter> </ClInclude> @@ -918,12 +828,6 @@ <UniqueIdentifier>{cd3e5871-5f13-4cdf-a869-f807737d2906}</UniqueIdentifier> <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> </Filter> - <Filter Include="Source Files\MixGraph"> - <UniqueIdentifier>{f0af5cea-2ec1-45c0-abe8-b93aa90e1df2}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\PatternRandomizer"> - <UniqueIdentifier>{f0e1b59c-04c9-4620-8314-06fd4ea21616}</UniqueIdentifier> - </Filter> <Filter Include="Header Files\Tuning"> <UniqueIdentifier>{86c7663b-6b61-4512-8a39-043d9b87ea1d}</UniqueIdentifier> </Filter> Modified: trunk/OpenMPT/mptrack/resource.h =================================================================== --- trunk/OpenMPT/mptrack/resource.h 2012-07-14 22:15:55 UTC (rev 1327) +++ trunk/OpenMPT/mptrack/resource.h 2012-07-17 21:08:15 UTC (rev 1328) @@ -125,11 +125,6 @@ #define IDD_EDIT_GOTO 444 #define IDD_DIALOG1 501 #define IDD_MOVEFXSLOT 501 -#define IDD_PATTERNRANDOMIZER 502 -#define IDD_PATTERNRANDOMIZER_NOTE 503 -#define IDD_PATTERNRANDOMIZER_INSTRUMENT 504 -#define IDD_PATTERNRANDOMIZER_VOLCMD 505 -#define IDD_PATTERNRANDOMIZER_EFFECT 506 #define IDD_CONTROL_GRAPH 507 #define IDD_SCALE_ENV_POINTS 510 #define IDD_TUNING 511 @@ -751,10 +746,6 @@ #define IDC_CLONEPLUG 2236 #define IDC_INSERTFXSLOT 2237 #define IDC_FILTERMODE 2238 -#define IDC_RANDOMIZE_NOTE_ENABLE 2240 -#define IDC_LIST2 2241 -#define IDC_APPLY 2243 -#define IDC_RANDOM_PLACEHOLDER 2244 #define IDC_AUTOSAVE_USECUSTOMDIR 2245 #define IDC_BUTTON_MODTYPE2 2246 #define IDC_BUTTON_PLAYERPROPS 2247 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |