You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(22) |
Nov
(38) |
Dec
(4) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(152) |
Feb
(358) |
Mar
(79) |
Apr
(23) |
May
(50) |
Jun
(35) |
Jul
(23) |
Aug
(6) |
Sep
(109) |
Oct
(108) |
Nov
(87) |
Dec
(8) |
2007 |
Jan
(79) |
Feb
(59) |
Mar
(7) |
Apr
(4) |
May
(28) |
Jun
(30) |
Jul
(11) |
Aug
|
Sep
(1) |
Oct
(3) |
Nov
(18) |
Dec
(4) |
2008 |
Jan
(1) |
Feb
(31) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
(3) |
Mar
(9) |
Apr
(17) |
May
(10) |
Jun
|
Jul
(2) |
Aug
(3) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
(8) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <hdo...@us...> - 2010-07-08 21:14:10
|
Revision: 1575 http://wired.svn.sourceforge.net/wired/?rev=1575&view=rev Author: hdoomsday Date: 2010-07-08 21:14:04 +0000 (Thu, 08 Jul 2010) Log Message: ----------- [COMPILE] Resolved issues with recent gcc Modified Paths: -------------- trunk/wired/src/editmidi/EditNote.cpp trunk/wired/src/libs/WiredWidgets/src/StaticBitmap.cpp Modified: trunk/wired/src/editmidi/EditNote.cpp =================================================================== --- trunk/wired/src/editmidi/EditNote.cpp 2010-05-31 18:02:58 UTC (rev 1574) +++ trunk/wired/src/editmidi/EditNote.cpp 2010-07-08 21:14:04 UTC (rev 1575) @@ -92,7 +92,7 @@ } } -BEGIN_EVENT_TABLE(EditNote, wxControl) +BEGIN_EVENT_TABLE(EditNote, wxPanel) EVT_PAINT(EditNote::OnPaint) EVT_MOTION(EditNote::OnMouseMove) EVT_LEFT_UP(EditNote::OnLeftUp) Modified: trunk/wired/src/libs/WiredWidgets/src/StaticBitmap.cpp =================================================================== --- trunk/wired/src/libs/WiredWidgets/src/StaticBitmap.cpp 2010-05-31 18:02:58 UTC (rev 1574) +++ trunk/wired/src/libs/WiredWidgets/src/StaticBitmap.cpp 2010-07-08 21:14:04 UTC (rev 1575) @@ -4,7 +4,7 @@ #include "StaticBitmap.h" -BEGIN_EVENT_TABLE(StaticBitmap, wxStaticText) +BEGIN_EVENT_TABLE(StaticBitmap, wxStaticBitmap) EVT_MOUSE_EVENTS(StaticBitmap::OnMouseEvent) END_EVENT_TABLE() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2010-05-31 18:03:05
|
Revision: 1574 http://wired.svn.sourceforge.net/wired/?rev=1574&view=rev Author: hdoomsday Date: 2010-05-31 18:02:58 +0000 (Mon, 31 May 2010) Log Message: ----------- [COMPAT] Wizard window is using Sizer instead hard-coded positions/size. It is better! Modified Paths: -------------- trunk/wired/src/gui/Wizard.cpp trunk/wired/src/gui/Wizard.h Modified: trunk/wired/src/gui/Wizard.cpp =================================================================== --- trunk/wired/src/gui/Wizard.cpp 2010-05-03 19:40:36 UTC (rev 1573) +++ trunk/wired/src/gui/Wizard.cpp 2010-05-31 18:02:58 UTC (rev 1574) @@ -17,33 +17,8 @@ #define WIZ_WIN_WIDTH 600 #define WIZ_WIN_HEIGHT 400 #define WIZ_WIN_SIZE wxSize(WIZ_WIN_WIDTH, WIZ_WIN_HEIGHT) -#define WIZ_BTN_HEIGHT 22 -#define WIZ_BTN_WIDTH 80 -#define WIZ_BTN_SIZE wxSize(WIZ_BTN_WIDTH, WIZ_BTN_HEIGHT) -#define WIZ_NEW_BTN_WIDTH 80 -#define WIZ_NEW_BTN_SIZE wxSize(WIZ_NEW_BTN_WIDTH, WIZ_BTN_HEIGHT) -#define WIZ_MARGIN 10 -#define WIZ_TOP_MARGIN 1 -#define WIZ_LABEL_WIDTH 120 -#define WIZ_TC_HEIGHT 32 -#define WIZ_TC_PATH_WIDTH (WIZ_WIN_WIDTH - WIZ_NEW_BTN_WIDTH - WIZ_MARGIN * 4 - WIZ_LABEL_WIDTH) -#define WIZ_TC_PATH_HEIGHT -1 -#define WIZ_TC_PATH_SIZE wxSize(WIZ_TC_PATH_WIDTH, WIZ_TC_PATH_HEIGHT) -#define WIZ_BROWSE_POS wxPoint(WIZ_WIN_WIDTH - WIZ_MARGIN - WIZ_BTN_WIDTH, WIZ_MARGIN + WIZ_TOP_MARGIN + WIZ_TC_HEIGHT) -#define WIZ_NEW_BTN_POS wxPoint(WIZ_WIN_WIDTH - WIZ_MARGIN - WIZ_BTN_WIDTH, WIZ_MARGIN * 2 + WIZ_TOP_MARGIN) -#define WIZ_RECENT_TITLE_POS_Y (WIZ_BTN_HEIGHT + WIZ_MARGIN * 3) -#define WIZ_BOTTOM_Y (WIZ_WIN_HEIGHT - WIZ_BTN_HEIGHT - WIZ_MARGIN) -#define WIZ_LC_RECENT_HEIGHT (WIZ_WIN_HEIGHT - WIZ_BTN_HEIGHT - WIZ_BTN_HEIGHT * 2 - WIZ_MARGIN * 6) -#define WIZ_LC_RECENT_Y (WIZ_RECENT_TITLE_POS_Y + WIZ_MARGIN * 3) #define WIZ_ICON_SIZE 32 -#define WIZ_TC_PATH_POS wxPoint(WIZ_MARGIN * 2 + WIZ_LABEL_WIDTH, WIZ_MARGIN + WIZ_TOP_MARGIN + WIZ_TC_HEIGHT) -#define WIZ_ST_NAME_SIZE wxSize(WIZ_LABEL_WIDTH, WIZ_TC_HEIGHT) -#define WIZ_ST_NAME_POS wxPoint(WIZ_MARGIN, WIZ_MARGIN * 2 + WIZ_TOP_MARGIN) -#define WIZ_TC_NAME_POS wxPoint(WIZ_MARGIN * 2 + WIZ_LABEL_WIDTH, WIZ_MARGIN * 2 + WIZ_TOP_MARGIN) -#define WIZ_ST_PATH_POS wxPoint(WIZ_MARGIN, WIZ_MARGIN + WIZ_TOP_MARGIN + WIZ_TC_HEIGHT) -#define WIZ_ST_PATH_SIZE WIZ_ST_NAME_SIZE - #ifndef RESIZE_ICON # define RESIZE_ICON(ico, w, h) (wxBitmap(ico).ConvertToImage().Rescale(w, h)) #endif @@ -55,55 +30,64 @@ #endif Wizard::Wizard() - : wxDialog(0x0, -1, _("Wired Wizard"), wxDefaultPosition, WIZ_WIN_SIZE, + : wxDialog(NULL, -1, _("Wired Wizard"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, _("Wired Wizard")), b_NewProject(NULL), tc_ProjectName(NULL), tc_NewPath(NULL) { LOG; - chosenDir = wxT(""); + chosenDir = wxT(""); + + st_ProjectName = new wxStaticText(this, -1, _("Project name :")); + st_NewPath = new wxStaticText(this, -1, _("Path :")); + st_RecentTitle = new wxStaticText(this, -1, _("Recent sessions :")); + + tc_ProjectName = new wxTextCtrl(this, Wizard_ProjectName, _("WiredProject"), + wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); + tc_NewPath = new wxTextCtrl(this, Wizard_Path, wxGetCwd() + wxFileName::GetPathSeparator() + wxT("my_wired_projects"), + wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); - st_ProjectName = new wxStaticText(this, -1, _("Project name :"), - WIZ_ST_NAME_POS, WIZ_ST_NAME_SIZE, - wxALIGN_RIGHT); - - tc_ProjectName = new wxTextCtrl(this, Wizard_ProjectName, _("WiredProject"), - WIZ_TC_NAME_POS, WIZ_TC_PATH_SIZE, wxTE_PROCESS_ENTER); - - st_NewPath = new wxStaticText(this, -1, _("Path :"), - WIZ_ST_PATH_POS, WIZ_ST_PATH_SIZE, - wxALIGN_RIGHT); - - tc_NewPath = new wxTextCtrl(this, Wizard_Path, wxGetCwd() + wxFileName::GetPathSeparator() + wxT("my_wired_projects"), - WIZ_TC_PATH_POS, WIZ_TC_PATH_SIZE, wxTE_PROCESS_ENTER); - - b_NewProject = new wxButton(this, Wizard_NewBtn, _("New &Project"), - WIZ_NEW_BTN_POS, WIZ_NEW_BTN_SIZE); - - b_BrowseNew = new wxButton(this, Wizard_Browse, _("&Browse"), - WIZ_BROWSE_POS, WIZ_BTN_SIZE); - - st_RecentTitle = new wxStaticText(this, -1, _("Recent sessions :"), - wxPoint(WIZ_MARGIN, WIZ_RECENT_TITLE_POS_Y + WIZ_MARGIN), - wxSize(WIZ_WIN_WIDTH / 2, WIZ_BTN_HEIGHT)); - - b_OK = new wxButton(this, Wizard_OK, _("&OK"), - wxPoint(WIZ_WIN_WIDTH - WIZ_BTN_WIDTH * 3 - WIZ_MARGIN * 3, WIZ_BOTTOM_Y), - WIZ_BTN_SIZE); - - b_Remove = new wxButton(this, Wizard_Remove, _("&Remove"), - wxPoint(WIZ_WIN_WIDTH - WIZ_BTN_WIDTH * 2 - WIZ_MARGIN * 2, WIZ_BOTTOM_Y), - WIZ_BTN_SIZE); - + b_NewProject = new wxButton(this, wxID_NEW, _("New &Project")); + b_BrowseNew = new wxButton(this, wxID_FIND, _("&Browse")); + + // Recent projects + lc_Recent = new wxListCtrl(this, Wizard_RecentList, wxDefaultPosition, wxDefaultSize, wxLC_ICON | wxLC_SINGLE_SEL); + st_Recent = new wxStaticText(this, -1, _("No recent sessions")); + + // PROCESSING BUTTONS + b_OK = new wxButton(this, wxID_OK, _("&OK")); + b_Remove = new wxButton(this, wxID_DELETE, _("&Remove")); b_Remove->Enable(false); + b_Exit = new wxButton(this, wxID_EXIT, _("E&xit")); + + // Sizers + wxBoxSizer* nameSizer = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* pathSizer = new wxBoxSizer(wxHORIZONTAL); + wxStdDialogButtonSizer* buttonSizer = new wxStdDialogButtonSizer(); + + wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); + + nameSizer->Add(st_ProjectName, wxSizerFlags().Border().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL).Proportion(15)); + nameSizer->Add(tc_ProjectName, wxSizerFlags().Border().Center().Expand().Proportion(70)); + nameSizer->Add(b_NewProject, wxSizerFlags().Border().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL).Proportion(15)); + + pathSizer->Add(st_NewPath, wxSizerFlags().Border().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL).Proportion(15)); + pathSizer->Add(tc_NewPath, wxSizerFlags().Border().Center().Expand().Proportion(70)); + pathSizer->Add(b_BrowseNew, wxSizerFlags().Border().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL).Proportion(15)); + + buttonSizer->Add(b_OK, wxSizerFlags().Border()); + buttonSizer->Add(b_Remove, wxSizerFlags().Border()); + buttonSizer->Add(b_Exit, wxSizerFlags().Border()); + + // main layout + mainSizer->Add(nameSizer); + mainSizer->Add(pathSizer); + mainSizer->Add(st_RecentTitle, wxSizerFlags().Border()); + mainSizer->Add(lc_Recent, wxSizerFlags().Border().Center().Expand().Proportion(100)); + mainSizer->Add(st_Recent, wxSizerFlags().Border().Center().Expand().Proportion(100)); + mainSizer->Add(buttonSizer, wxSizerFlags().Border().Bottom()); - b_Exit = new wxButton(this, Wizard_Exit, _("E&xit"), - wxPoint(WIZ_WIN_WIDTH - WIZ_BTN_WIDTH - WIZ_MARGIN, WIZ_BOTTOM_Y), WIZ_BTN_SIZE); - - lc_Recent = 0x0; - st_Recent = 0x0; - vector<wxFileName> pathList = WiredSettings->GetRecentDirs(); if (pathList.size()) { @@ -115,7 +99,19 @@ tc_ProjectName->SetValue(pathList[0].GetName()); #endif } - UpdateList(); + UpdateList(); + + + // set a minimal size to the window + mainSizer->SetMinSize(WIZ_WIN_SIZE); + buttonSizer->Realize(); + + // center the window on the screen + Center(); + // resize items and window + SetSizer(mainSizer); + mainSizer->SetSizeHints(this); + tc_ProjectName->SetFocus(); } @@ -123,15 +119,10 @@ { vector<wxFileName> pathList = WiredSettings->GetRecentDirs(); - delete lc_Recent; - delete st_Recent; if (pathList.size()) - { - st_Recent = 0x0; - lc_Recent = new wxListCtrl(this, Wizard_RecentList, - wxPoint(WIZ_MARGIN, WIZ_LC_RECENT_Y), - wxSize(WIZ_WIN_WIDTH - (WIZ_MARGIN*2), WIZ_LC_RECENT_HEIGHT), - wxLC_ICON | wxLC_SINGLE_SEL); + { + lc_Recent->Show(); + st_Recent->Hide(); wxString thispath; wxImage folder_icon(wired_session_folder_xpm); @@ -147,11 +138,8 @@ } else { - lc_Recent = 0x0; - st_Recent = new wxStaticText(this, -1, _("No recent sessions"), - wxPoint(WIZ_MARGIN, WIZ_LC_RECENT_Y + (WIZ_LC_RECENT_HEIGHT) / 2), - wxSize(WIZ_WIN_WIDTH - (WIZ_MARGIN*2), WIZ_LC_RECENT_HEIGHT), - wxALIGN_CENTER); + lc_Recent->Hide(); + st_Recent->Show(); } } @@ -298,7 +286,7 @@ int item = -1; item = lc_Recent->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item >= 0 && item < pathList.size()) + if (item >= 0 && (unsigned int)item < pathList.size()) WiredSettings->RemoveRecentDir(item); UpdateList(); b_Remove->Enable(false); @@ -315,7 +303,7 @@ vector<wxFileName> pathList = WiredSettings->GetRecentDirs(); item = lc_Recent->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (item >= 0 && item < pathList.size()) + if (item >= 0 && (unsigned int)item < pathList.size()) { #if wxCHECK_VERSION (2,8,0) tc_ProjectName->ChangeValue(pathList[item].GetName()); @@ -359,7 +347,7 @@ { LoadProject(); } - + std::cout << "[WIZARD] ChosenDir : " << chosenDir.mb_str() << std::endl; } @@ -387,15 +375,15 @@ BEGIN_EVENT_TABLE(Wizard, wxDialog) - EVT_BUTTON(Wizard_NewBtn, Wizard::OnNewClick) + EVT_BUTTON(wxID_NEW, Wizard::OnNewClick) + EVT_BUTTON(wxID_FIND, Wizard::OnBrowseClick) + EVT_BUTTON(wxID_OK, Wizard::OnOkClick) + EVT_BUTTON(wxID_DELETE, Wizard::OnRemove) + EVT_BUTTON(wxID_EXIT, Wizard::OnExitClick) EVT_TEXT_ENTER(Wizard_Path, Wizard::OnNewClick) EVT_TEXT_ENTER(Wizard_ProjectName, Wizard::OnNewClick) - EVT_BUTTON(Wizard_Browse, Wizard::OnBrowseClick) EVT_LIST_ITEM_ACTIVATED(Wizard_RecentList, Wizard::OnListDClick) EVT_LIST_ITEM_SELECTED(Wizard_RecentList, Wizard::OnListClick) - EVT_BUTTON(Wizard_Remove, Wizard::OnRemove) - EVT_BUTTON(Wizard_Exit, Wizard::OnExitClick) -EVT_BUTTON(Wizard_OK, Wizard::OnOkClick) EVT_TEXT(Wizard_Path, Wizard::OnTextChange) EVT_TEXT(Wizard_ProjectName, Wizard::OnTextChange) END_EVENT_TABLE() Modified: trunk/wired/src/gui/Wizard.h =================================================================== --- trunk/wired/src/gui/Wizard.h 2010-05-03 19:40:36 UTC (rev 1573) +++ trunk/wired/src/gui/Wizard.h 2010-05-31 18:02:58 UTC (rev 1574) @@ -130,14 +130,9 @@ */ enum { - Wizard_NewBtn = 633, - Wizard_ProjectName, + Wizard_ProjectName = 633, Wizard_Path, - Wizard_Browse, - Wizard_RecentList, - Wizard_Remove, - Wizard_Exit, - Wizard_OK + Wizard_RecentList }; #endif /*__WIZARD_H__*/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2010-05-03 19:40:42
|
Revision: 1573 http://wired.svn.sourceforge.net/wired/?rev=1573&view=rev Author: hdoomsday Date: 2010-05-03 19:40:36 +0000 (Mon, 03 May 2010) Log Message: ----------- [CLEAN] Duplicate file Removed Paths: ------------- trunk/wired/StereoSample.wav Deleted: trunk/wired/StereoSample.wav =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2010-05-03 19:39:20
|
Revision: 1572 http://wired.svn.sourceforge.net/wired/?rev=1572&view=rev Author: hdoomsday Date: 2010-05-03 19:39:14 +0000 (Mon, 03 May 2010) Log Message: ----------- [TEST] Added first UnitTest. What? HolyShit! Modified Paths: -------------- trunk/wired/win32/CodeBlocks/Wired.workspace Added Paths: ----------- trunk/wired/StereoSample.wav trunk/wired/tests/ trunk/wired/tests/audio/ trunk/wired/tests/audio/StereoSample.wav trunk/wired/tests/audio/main.cpp trunk/wired/tests/audio/testAudio.cbp trunk/wired/tests/test/ trunk/wired/tests/test/WiredTest.h Added: trunk/wired/StereoSample.wav =================================================================== (Binary files differ) Property changes on: trunk/wired/StereoSample.wav ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wired/tests/audio/StereoSample.wav =================================================================== (Binary files differ) Property changes on: trunk/wired/tests/audio/StereoSample.wav ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wired/tests/audio/main.cpp =================================================================== --- trunk/wired/tests/audio/main.cpp (rev 0) +++ trunk/wired/tests/audio/main.cpp 2010-05-03 19:39:14 UTC (rev 1572) @@ -0,0 +1,25 @@ +#include "WiredTest.h" + +#include <wx/wx.h> +#include <wx/string.h> + +#include "audio/WaveFile.h" + +int testWaveFile() +{ + const wxString stereoWaveFileName("StereoSample.wav"); + + WaveFile wav(stereoWaveFileName); + + TEST_ASSERT(wav.GetNumberOfChannels() == 2); + TEST_ASSERT(wav.GetNumberOfFrames() == 82880); + TEST_ASSERT(wav.GetSampleRate() == 44100); + TEST_ASSERT(wav.GetFormat() == 65538); + return 0; +} + +int main() +{ + testWaveFile(); + return 0; +} Added: trunk/wired/tests/audio/testAudio.cbp =================================================================== --- trunk/wired/tests/audio/testAudio.cbp (rev 0) +++ trunk/wired/tests/audio/testAudio.cbp 2010-05-03 19:39:14 UTC (rev 1572) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="testAudio" /> + <Option pch_mode="2" /> + <Option compiler="gcc" /> + <Build> + <Target title="Debug"> + <Option output="bin\testAudio" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-g" /> + </Compiler> + </Target> + <Target title="Release"> + <Option output="bin\Release\testAudio" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-O2" /> + </Compiler> + <Linker> + <Add option="-s" /> + </Linker> + </Target> + </Build> + <Compiler> + <Add option="-Wall" /> + <Add option="-fexceptions" /> + <Add directory="..\test" /> + <Add directory="..\..\src" /> + </Compiler> + <Linker> + <Add library="wx_msw-2.8" /> + <Add library="sndfile" /> + </Linker> + <Unit filename="..\..\src\audio\ClipBoard.cpp" /> + <Unit filename="..\..\src\audio\ClipBoard.h" /> + <Unit filename="..\..\src\audio\WaveFile.cpp" /> + <Unit filename="..\..\src\audio\WaveFile.h" /> + <Unit filename="..\..\src\audio\WriteWaveFile.cpp" /> + <Unit filename="..\..\src\audio\WriteWaveFile.h" /> + <Unit filename="main.cpp" /> + <Unit filename="..\test\WiredTest.h" /> + <Extensions> + <code_completion /> + <debugger /> + </Extensions> + </Project> +</CodeBlocks_project_file> Added: trunk/wired/tests/test/WiredTest.h =================================================================== --- trunk/wired/tests/test/WiredTest.h (rev 0) +++ trunk/wired/tests/test/WiredTest.h 2010-05-03 19:39:14 UTC (rev 1572) @@ -0,0 +1,24 @@ +// Copyright (C) 2004-2010 by Wired Team +// Under the GNU General Public License Version 2, June 1991 + +#ifndef __WIREDTEST_H__ +#define __WIREDTEST_H__ + +#include <iostream> + +/** + * Define all needs for unit testing + */ +#define TEST_ASSERT(x) \ + try { \ + if(!(x)) { \ + std::cerr << "Assert failed at " << __FILE__ << ":" << __LINE__ << "(" << __FUNCTION__ << ")" << std::endl; \ + exit(-1); \ + } \ + } \ + catch(...) { \ + std::cerr << "An exception was throw at " << __FILE__ << ":" << __LINE__ << "(" << __FUNCTION__ << ")" << std::endl; \ + exit(-1); \ + } + +#endif // __WIREDTEST_H__ Modified: trunk/wired/win32/CodeBlocks/Wired.workspace =================================================================== --- trunk/wired/win32/CodeBlocks/Wired.workspace 2010-05-03 19:33:38 UTC (rev 1571) +++ trunk/wired/win32/CodeBlocks/Wired.workspace 2010-05-03 19:39:14 UTC (rev 1572) @@ -18,5 +18,6 @@ <Project filename="libWiredCompressor.cbp" /> <Project filename="libWiredFilter.cbp" /> <Project filename="libWiredSynth.cbp" /> + <Project filename="..\..\tests\audio\testAudio.cbp" /> </Workspace> </CodeBlocks_workspace_file> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2010-05-03 19:33:46
|
Revision: 1571 http://wired.svn.sourceforge.net/wired/?rev=1571&view=rev Author: hdoomsday Date: 2010-05-03 19:33:38 +0000 (Mon, 03 May 2010) Log Message: ----------- [COMPIL] Added missing files into CodeBlocks project Modified Paths: -------------- trunk/wired/win32/CodeBlocks/libWiredWahwah.cbp trunk/wired/win32/CodeBlocks/wired.cbp trunk/wired/win32/README.txt Modified: trunk/wired/win32/CodeBlocks/libWiredWahwah.cbp =================================================================== --- trunk/wired/win32/CodeBlocks/libWiredWahwah.cbp 2010-05-03 19:27:21 UTC (rev 1570) +++ trunk/wired/win32/CodeBlocks/libWiredWahwah.cbp 2010-05-03 19:33:38 UTC (rev 1571) @@ -7,7 +7,7 @@ <Option compiler="gcc" /> <Build> <Target title="Debug"> - <Option output=".\bin\plugins\libWiredWahwah.dll" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\plugins\libWiredWahwah" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Debug\" /> <Option type="3" /> <Option compiler="gcc" /> @@ -16,7 +16,7 @@ </Compiler> </Target> <Target title="Release"> - <Option output=".\bin\plugins\libWiredWahwah.dll" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\plugins\libWiredWahwah" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Release\" /> <Option type="3" /> <Option compiler="gcc" /> @@ -35,6 +35,8 @@ <Add directory="..\..\src\redist" /> <Add directory="..\..\src\libs\WiredWidgets\src" /> <Add directory="..\..\src\midi" /> + <Add directory="..\..\src\save" /> + <Add directory="..\..\src\xml" /> </Compiler> <Linker> <Add library="wx_msw-2.8" /> @@ -47,6 +49,7 @@ <Unit filename="..\..\src\redist\Plugin.h" /> <Extensions> <code_completion /> + <debugger /> </Extensions> </Project> </CodeBlocks_project_file> Modified: trunk/wired/win32/CodeBlocks/wired.cbp =================================================================== --- trunk/wired/win32/CodeBlocks/wired.cbp 2010-05-03 19:27:21 UTC (rev 1570) +++ trunk/wired/win32/CodeBlocks/wired.cbp 2010-05-03 19:33:38 UTC (rev 1571) @@ -144,6 +144,7 @@ <Unit filename="..\..\src\engine\version.h" /> <Unit filename="..\..\src\error.hh" /> <Unit filename="..\..\src\fileloader\FileConversion.cpp" /> + <Unit filename="..\..\src\fileloader\FileConversion.h" /> <Unit filename="..\..\src\fileloader\FileStat.cpp" /> <Unit filename="..\..\src\fileloader\FileStat.h" /> <Unit filename="..\..\src\fileloader\TreeItemData.cpp" /> @@ -161,7 +162,6 @@ <Unit filename="..\..\src\gui\Colour.h" /> <Unit filename="..\..\src\gui\Cursor.cpp" /> <Unit filename="..\..\src\gui\Cursor.h" /> - <Unit filename="..\..\src\gui\FileConversion.h" /> <Unit filename="..\..\src\gui\FloatingFrame.cpp" /> <Unit filename="..\..\src\gui\FloatingFrame.h" /> <Unit filename="..\..\src\gui\HelpCtrl.cpp" /> @@ -194,6 +194,7 @@ <Unit filename="..\..\src\gui\Rack.cpp" /> <Unit filename="..\..\src\gui\Rack.h" /> <Unit filename="..\..\src\gui\RackTrack.cpp" /> + <Unit filename="..\..\src\gui\RackTrack.h" /> <Unit filename="..\..\src\gui\Ruler.cpp" /> <Unit filename="..\..\src\gui\Ruler.h" /> <Unit filename="..\..\src\gui\SelectionZone.cpp" /> Modified: trunk/wired/win32/README.txt =================================================================== --- trunk/wired/win32/README.txt 2010-05-03 19:27:21 UTC (rev 1570) +++ trunk/wired/win32/README.txt 2010-05-03 19:33:38 UTC (rev 1571) @@ -1,40 +1,40 @@ -How to build Wired on win32 - -You need to: -- install MINGW + GDB http://www.mingw.org/ -- install MSYS + Developer Toolkit http://www.mingw.org/ - or - install Code::Blocks IDE last build http://forums.codeblocks.org/index.php?board=20.0 -- install wired-libs-win32 package ox...@us... - or - compile it by yourself the packages: - wxWidgets http://www.wxwidgets.org/ - libsamplerate http://www.mega-nerd.com/SRC/ - SoundTouch http://www.surina.net/soundtouch/ - sndfile http://www.mega-nerd.com/libsndfile/ - portaudio src/portaudio or http://www.cs.cmu.edu/~music/portmusic/ - portmidi src/midi/portmidi or http://www.cs.cmu.edu/~music/portmusic/ - -Using MSYS: -Inside MSYS prompt, change the direcory to "win32" and type "make". - -Using Code::Blocks IDE: -Open the file "win32/CodeBlocks/Wired.workspace" and run "Build > Build workspace" to compile everything. -More details at http://www.codeblocks.org/ - --------------------------------------------------------------------------------- - -How to generate a installer - -You need to: -- install Inno Setup Compiler http://www.jrsoftware.org/isdl.php - -Open the file "win32/installer.iss" using Inno Setup and press Ctrl+F9. -Take a look at "win32/Output" and enjoy! - --------------------------------------------------------------------------------- - -How to run a fresh build - -Run "copydata.bat" to copy data (logo, icon, ...) content to bin directory. -The required DLLs need to be on PATH or at the same directory where wired.exe is. +How to build Wired on win32 + +You need to: +- install MINGW + GDB http://www.mingw.org/ +- install MSYS + Developer Toolkit http://www.mingw.org/ + or + install Code::Blocks IDE last build http://forums.codeblocks.org/index.php?board=20.0 +- install wired-libs-win32 package ox...@us... + or + compile it by yourself the packages: + wxWidgets http://www.wxwidgets.org/ + libsamplerate http://www.mega-nerd.com/SRC/ + SoundTouch http://www.surina.net/soundtouch/ + sndfile http://www.mega-nerd.com/libsndfile/ + portaudio src/portaudio or http://www.cs.cmu.edu/~music/portmusic/ + portmidi src/midi/portmidi or http://www.cs.cmu.edu/~music/portmusic/ + +Using MSYS: +Inside MSYS prompt, change the direcory to "win32" and type "make". + +Using Code::Blocks IDE: +Open the file "win32/CodeBlocks/Wired.workspace" and run "Build > Build workspace" to compile everything. +More details at http://www.codeblocks.org/ + +-------------------------------------------------------------------------------- + +How to generate a installer + +You need to: +- install Inno Setup Compiler http://www.jrsoftware.org/isdl.php + +Open the file "win32/installer.iss" using Inno Setup and press Ctrl+F9. +Take a look at "win32/Output" and enjoy! + +-------------------------------------------------------------------------------- + +How to run a fresh build + +Run "copydata.bat" to copy data (logo, icon, ...) content to bin directory. +The required DLLs need to be on PATH or at the same directory where wired.exe is. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2010-05-03 19:27:28
|
Revision: 1570 http://wired.svn.sourceforge.net/wired/?rev=1570&view=rev Author: hdoomsday Date: 2010-05-03 19:27:21 +0000 (Mon, 03 May 2010) Log Message: ----------- [GUI] Added dialogbox if Wired was not installed. Modified Paths: -------------- trunk/wired/src/engine/version.h trunk/wired/src/gui/MainApp.cpp Modified: trunk/wired/src/engine/version.h =================================================================== --- trunk/wired/src/engine/version.h 2010-05-03 19:25:56 UTC (rev 1569) +++ trunk/wired/src/engine/version.h 2010-05-03 19:27:21 UTC (rev 1570) @@ -8,7 +8,7 @@ #define WIRED_TITLE (wxT("Wired 0.7.0")) #define WIRED_VERSION (wxT("0.7.0")) -#define WIRED_BUGS (wxT("http://sourceforge.net/projects/wired")) -#define WIRED_FORUMS (wxT("https://sourceforge.net/forum/?group_id=120022")) +#define WIRED_URL_BUGS (wxT("http://sourceforge.net/projects/wired")) +#define WIRED_URL_FORUMS (wxT("https://sourceforge.net/forum/?group_id=120022")) #endif // __VERSION_H__ Modified: trunk/wired/src/gui/MainApp.cpp =================================================================== --- trunk/wired/src/gui/MainApp.cpp 2010-05-03 19:25:56 UTC (rev 1569) +++ trunk/wired/src/gui/MainApp.cpp 2010-05-03 19:27:21 UTC (rev 1570) @@ -179,6 +179,17 @@ // alert dialog can use it before frame loading wxYield(); } + else + { + wxString errorText; + errorText = wxT("No images found. Have you correctly installed shared data ?\n" + "Please launch \"make install\" if you are on Linux or \"copydata.bat\"" + " if you are on Windows.\n" + "If failed, try to install with Wired Installer or submit issue to developers.\n" + "WIRED_URL_BUGS"); + errorText.Replace(wxT("WIRED_URL_BUGS"), WIRED_URL_BUGS); + AlertDialog(wxT("MainApp"), errorText); + } } else { @@ -289,11 +300,11 @@ { LOG; wxString welcome; - welcome = wxT("Welcome to WIRED_NAME vWIRED_VERSION !\nPlease note that WIRED_NAME is still under heavy development and that some of its features may not work fully and/or correctly yet.\n\nYour first step will be to configure your soundcard settings in the Edit/Settings dialog. Select your device, a 32 bits float sample format (as it is the only working option right now) and any sample rate and latency that your sound card supports. Please note that the smaller the latency value is set, the more real time WIRED_NAME will perform but setting it too low will cause drops and glitches. You can try different values and see which one is the best for your soundcard (2048 samples per buffer will be ok in most cases).\n\nYou will find a contextual Help at the bottom right corner of the WIRED_NAME window. If you move your mouse over a control, it will show you the help associated with this item. You can replace it by the WIRED_NAME Mixer by clicking on the tool icon in the top right corner of this area.\n\nIf you find any bug, please make a bug report at :\nWIRED_BUGS\n\nIf you need help or want to discuss about WIRED_NAME, pleast visit our web site and our forum :\nWIRED_FORUMS\nAny feedback is also appreciated.\n\nEnjoy the free music experience !"); + welcome = wxT("Welcome to WIRED_NAME vWIRED_VERSION !\nPlease note that WIRED_NAME is still under heavy development and that some of its features may not work fully and/or correctly yet.\n\nYour first step will be to configure your soundcard settings in the Edit/Settings dialog. Select your device, a 32 bits float sample format (as it is the only working option right now) and any sample rate and latency that your sound card supports. Please note that the smaller the latency value is set, the more real time WIRED_NAME will perform but setting it too low will cause drops and glitches. You can try different values and see which one is the best for your soundcard (2048 samples per buffer will be ok in most cases).\n\nYou will find a contextual Help at the bottom right corner of the WIRED_NAME window. If you move your mouse over a control, it will show you the help associated with this item. You can replace it by the WIRED_NAME Mixer by clicking on the tool icon in the top right corner of this area.\n\nIf you find any bug, please make a bug report at :\nWIRED_URL_BUGS\n\nIf you need help or want to discuss about WIRED_NAME, pleast visit our web site and our forum :\nWIRED_URL_FORUMS\nAny feedback is also appreciated.\n\nEnjoy the free music experience !"); welcome.Replace(wxT("WIRED_VERSION"), WIRED_VERSION); welcome.Replace(wxT("WIRED_NAME"), WIRED_NAME); - welcome.Replace(wxT("WIRED_BUGS"), WIRED_BUGS); - welcome.Replace(wxT("WIRED_FORUMS"), WIRED_FORUMS); + welcome.Replace(wxT("WIRED_URL_BUGS"), WIRED_URL_BUGS); + welcome.Replace(wxT("WIRED_URL_FORUMS"), WIRED_URL_FORUMS); wxMessageDialog msg(MainWin, welcome, WIRED_NAME, wxOK | wxICON_INFORMATION | wxCENTRE); msg.ShowModal(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2010-05-03 19:26:02
|
Revision: 1569 http://wired.svn.sourceforge.net/wired/?rev=1569&view=rev Author: hdoomsday Date: 2010-05-03 19:25:56 +0000 (Mon, 03 May 2010) Log Message: ----------- [COMPAT] Fixed warning leading probably to a bad behaviour Modified Paths: -------------- trunk/wired/src/engine/Settings.cpp trunk/wired/src/gui/MLTree.cpp trunk/wired/src/gui/MLTree.h trunk/wired/src/gui/SeqTrack.cpp trunk/wired/src/gui/Transport.cpp trunk/wired/src/midi/MidiController.cpp trunk/wired/src/midi/MidiController.h trunk/wired/src/midi/MidiFile.cpp trunk/wired/src/midi/MidiFile.h Modified: trunk/wired/src/engine/Settings.cpp =================================================================== --- trunk/wired/src/engine/Settings.cpp 2010-05-03 19:22:39 UTC (rev 1568) +++ trunk/wired/src/engine/Settings.cpp 2010-05-03 19:25:56 UTC (rev 1569) @@ -362,7 +362,8 @@ recent << wxT("Recent") << i; conf->Write(recent, pathList[i].GetFullPath()); } + return true; } - else - cout << "[SETTINGS] AddDirToRecent() : Can't access conf" << endl; + cout << "[SETTINGS] AddDirToRecent() : Can't access conf" << endl; + return false; } Modified: trunk/wired/src/gui/MLTree.cpp =================================================================== --- trunk/wired/src/gui/MLTree.cpp 2010-05-03 19:22:39 UTC (rev 1568) +++ trunk/wired/src/gui/MLTree.cpp 2010-05-03 19:25:56 UTC (rev 1569) @@ -577,7 +577,7 @@ return (itemToAdd); } -wxTreeItemId MLTree::DelFileInProject(wxString FileToDel, bool expand) +void MLTree::DelFileInProject(wxString FileToDel, bool expand) { LOG; wxFileName fileName(FileToDel); @@ -1032,10 +1032,6 @@ wxTreeItemId itemAdded; int slashPos; - - wxFileName *File = new wxFileName(selfile); - - infos = GetTreeItemStructFromId(item_to_drag); if (infos._label != wxT("")) { @@ -1053,7 +1049,8 @@ _nodes[itemAdded] = infos; return itemAdded; } - } + } + return NULL; } void MLTree::DragAndDrop(wxTreeItemId item) Modified: trunk/wired/src/gui/MLTree.h =================================================================== --- trunk/wired/src/gui/MLTree.h 2010-05-03 19:22:39 UTC (rev 1568) +++ trunk/wired/src/gui/MLTree.h 2010-05-03 19:25:56 UTC (rev 1569) @@ -69,7 +69,7 @@ wxString GetFile () { return (_Selfile); } wxTreeItemId AddFileInProject (wxString FileToAdd, bool expand); - wxTreeItemId DelFileInProject (wxString FileToAdd, bool expand); + void DelFileInProject (wxString FileToAdd, bool expand); void LoadPatch (wxString filename); void OnSave (wxString filename); Modified: trunk/wired/src/gui/SeqTrack.cpp =================================================================== --- trunk/wired/src/gui/SeqTrack.cpp 2010-05-03 19:22:39 UTC (rev 1568) +++ trunk/wired/src/gui/SeqTrack.cpp 2010-05-03 19:25:56 UTC (rev 1569) @@ -57,6 +57,9 @@ case eMidiTrack: str.Printf(wxT("MIDI %d"), ++MidiTrackCount); break; + default: + str.Printf(wxT("Unknown %d"), ++MidiTrackCount); + break; } Text = new wxTextCtrl(this, SeqTrack_OnNameChange, str, wxPoint(6, 8), wxSize(TRACK_WIDTH - 68, 18), wxTE_PROCESS_ENTER); @@ -73,12 +76,20 @@ case eMidiTrack: trackTypeImage = new wxImage(wxString(WiredSettings->DataDir + _("ihm/seqtrack/tracktype-midi.png")), wxBITMAP_TYPE_PNG); break; + default: + trackTypeImage = NULL; + break; } - wxBitmap* trackTypeBitmap = new wxBitmap(*trackTypeImage); - delete trackTypeImage; + if(trackTypeImage) + { + wxBitmap* trackTypeBitmap = new wxBitmap(*trackTypeImage); + delete trackTypeImage; - trackTypeStatic = new wxStaticBitmap(this, -1, *trackTypeBitmap, wxPoint(62, 8)); + trackTypeStatic = new wxStaticBitmap(this, -1, *trackTypeBitmap, wxPoint(62, 8)); + } + else + trackTypeStatic = NULL; // record and mute button wxImage *rec_up = new wxImage(wxString(WiredSettings->DataDir + wxString(REC_UP)), wxBITMAP_TYPE_PNG); @@ -136,7 +147,8 @@ // we overwrite LEFT_DOWN event of these class, but we propagate it on each // parent, recursivly (until any catch has not .Skip() call). - trackTypeStatic->Connect(wxEVT_LEFT_DOWN, wxObjectEventFunction(&SeqTrack::PropagateEvent)); + if(trackTypeStatic) + trackTypeStatic->Connect(wxEVT_LEFT_DOWN, wxObjectEventFunction(&SeqTrack::PropagateEvent)); Vu->Connect(wxEVT_LEFT_DOWN, wxObjectEventFunction(&SeqTrack::PropagateEvent)); // Modified: trunk/wired/src/gui/Transport.cpp =================================================================== --- trunk/wired/src/gui/Transport.cpp 2010-05-03 19:22:39 UTC (rev 1568) +++ trunk/wired/src/gui/Transport.cpp 2010-05-03 19:25:56 UTC (rev 1569) @@ -88,7 +88,7 @@ down_up, down_down); wxString s; - s.Printf(wxT("%d"), Seq->BPM); + s.Printf(wxT("%f"), Seq->BPM); BpmLabel = new TransparentStaticText(this, Transport_BpmClick, s, wxPoint(49, 20), wxSize(-1, 12)); BpmLabel->SetFont(wxFont(11, wxDEFAULT, wxNORMAL, wxNORMAL)); Modified: trunk/wired/src/midi/MidiController.cpp =================================================================== --- trunk/wired/src/midi/MidiController.cpp 2010-05-03 19:22:39 UTC (rev 1568) +++ trunk/wired/src/midi/MidiController.cpp 2010-05-03 19:25:56 UTC (rev 1569) @@ -12,8 +12,8 @@ #define MIDIWIDTH 206 -MidiController::MidiController(wxWindow *parent) : - wxDialog(parent, (wxWindowID)-1, (const wxString&)_("Assign Midi Controller")) +MidiController::MidiController(wxWindow *parent) + : wxDialog(parent, -1, wxString(_("Assign Midi Controller"))) { Centre(); Modified: trunk/wired/src/midi/MidiController.h =================================================================== --- trunk/wired/src/midi/MidiController.h 2010-05-03 19:22:39 UTC (rev 1568) +++ trunk/wired/src/midi/MidiController.h 2010-05-03 19:25:56 UTC (rev 1569) @@ -17,20 +17,20 @@ void OnOkBtnClick(wxCommandEvent &event); void OnCancelBtnClick(wxCommandEvent &event); - + void ProcessMidi(int midi_msg[3]); - - int Type; + + int Type; int Controller; int Value; - + bool Note; - + private: wxSpinCtrl *ChannelCtrl; wxSpinCtrl *ControllerCtrl; wxSpinCtrl *ValueCtrl; - + DECLARE_EVENT_TABLE() }; Modified: trunk/wired/src/midi/MidiFile.cpp =================================================================== --- trunk/wired/src/midi/MidiFile.cpp 2010-05-03 19:22:39 UTC (rev 1568) +++ trunk/wired/src/midi/MidiFile.cpp 2010-05-03 19:25:56 UTC (rev 1569) @@ -46,7 +46,7 @@ /*** Classe MidiFileEvent ***/ /*************************************************************************************/ -MidiFileEvent::MidiFileEvent(unsigned long pos, unsigned char ID, unsigned char channel, +MidiFileEvent::MidiFileEvent(unsigned long pos, unsigned char ID, unsigned char channel, unsigned char p1, unsigned char p2) : Event(pos, ID) { this->Channel = channel; @@ -60,10 +60,10 @@ /*** Classe SysExEvent ***/ /*************************************************************************************/ -SysExEvent::SysExEvent(unsigned long pos, unsigned char ID, unsigned long len, +SysExEvent::SysExEvent(unsigned long pos, unsigned char ID, unsigned long len, unsigned char *data) : Event(pos, ID) { - this->len = len; + this->len = len; this->Type = SYSEX_EVENT_TYPE; this->data = (unsigned char *)malloc(len); this->Pos = pos; @@ -94,16 +94,16 @@ bytesWritten += midiFileHandle.Write(data, len); return (bytesWritten); } - + /*************************************************************************************/ /*** Classe NonMidiEvent ***/ /*************************************************************************************/ -NonMidiEvent::NonMidiEvent(unsigned long pos, unsigned char ID, unsigned long len, - unsigned char *data) : Event(pos, ID) +NonMidiEvent::NonMidiEvent(unsigned long pos, unsigned char ID, unsigned long len, + unsigned char *data) : Event(pos, ID) { - this->len = len; + this->len = len; this->Type = NONMIDI_EVENT_TYPE; this->data = (unsigned char *)malloc(len); this->Pos = pos; @@ -124,8 +124,8 @@ bytesWritten += midiFileHandle.Write(data, len); return (bytesWritten); } - + /*************************************************************************************/ /*** Classe MidiTrack ***/ /*************************************************************************************/ @@ -172,7 +172,7 @@ _filename = wxT(""); vector<MidiEvent *> evts; MaxPos = len; - + MidiTrack(evts, PPQN, _filename, Seq->Tracks.size()); } @@ -236,7 +236,7 @@ #ifdef __DEBUG__ cout << " is midi 1" << endl; #endif - Events.push_back(new MidiFileEvent(abs, ME_CODE(evttype), ME_CHANNEL(evttype), + Events.push_back(new MidiFileEvent(abs, ME_CODE(evttype), ME_CHANNEL(evttype), p1, buffer[ofs++])); break; case ME_PRGMCHANGE: @@ -244,7 +244,7 @@ #ifdef __DEBUG__ cout << " is midi 2" << endl; #endif - Events.push_back(new MidiFileEvent(abs, ME_CODE(evttype), ME_CHANNEL(evttype), + Events.push_back(new MidiFileEvent(abs, ME_CODE(evttype), ME_CHANNEL(evttype), p1, 0)); break; } @@ -435,7 +435,7 @@ /*** Classe MidiFile ***/ /*************************************************************************************/ -MidiFile::MidiFile(wxString filename, unsigned long long seqTrackIndex) +MidiFile::MidiFile(wxString filename, long long seqTrackIndex) { NbTracks = 0; Division = 0; @@ -586,7 +586,7 @@ { perror("[MidiFile] read"); MIDIFile.Close(); - return; + return; } Type = htons(Type); NbTracks = htons(NbTracks); Modified: trunk/wired/src/midi/MidiFile.h =================================================================== --- trunk/wired/src/midi/MidiFile.h 2010-05-03 19:22:39 UTC (rev 1568) +++ trunk/wired/src/midi/MidiFile.h 2010-05-03 19:25:56 UTC (rev 1569) @@ -225,7 +225,7 @@ class MidiFile { public: - MidiFile(wxString filename, unsigned long long wiredTrackIndex = -1); + MidiFile(wxString filename, long long wiredTrackIndex = -1); ~MidiFile(); void ReadMidiFile(); @@ -233,7 +233,7 @@ bool InsertMidiTrack(MidiTrack *track, unsigned short noTrack = 0); long GetNumberOfTracks() { return NbTracks; } long GetDivision() { return Division; } - MidiTrack *GetTrack(int num) { if ((num >= 0) && (num < NbTracks) && num < Tracks.size()) + MidiTrack *GetTrack(int num) { if ((num >= 0) && (num < (int)NbTracks) && num < (int)Tracks.size()) return Tracks[num]; else return NULL; } wxString GetFileName() { return (filename); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2010-05-03 19:22:45
|
Revision: 1568 http://wired.svn.sourceforge.net/wired/?rev=1568&view=rev Author: hdoomsday Date: 2010-05-03 19:22:39 +0000 (Mon, 03 May 2010) Log Message: ----------- [COMPAT] WxEvent fixed under win32: plugin API updated to handle different mouse events instead of only one. Modified Paths: -------------- trunk/wired/src/gui/Rack.cpp trunk/wired/src/gui/Rack.h trunk/wired/src/plugins/HostCallback.cpp trunk/wired/src/redist/Plugin.cpp trunk/wired/src/redist/Plugin.h Modified: trunk/wired/src/gui/Rack.cpp =================================================================== --- trunk/wired/src/gui/Rack.cpp 2010-05-03 17:34:56 UTC (rev 1567) +++ trunk/wired/src/gui/Rack.cpp 2010-05-03 19:22:39 UTC (rev 1568) @@ -38,6 +38,8 @@ copy_plug = NULL; filePath.Printf(wxT("/tmp/.tmpccp")); CleanChildren(); + OldX = 0; + OldY = 0; } Rack::~Rack() @@ -258,143 +260,132 @@ return false; } -void Rack::SetSelected(Plugin *p) +void Rack::SetSelected(Plugin *newSelected) { - t_ListRackTrack::iterator i; - list<Plugin *>::iterator j; - - if (!p) + if(selectedPlugin != newSelected) { - selectedPlugin = 0x0; - selectedTrack = 0x0; + t_ListRackTrack::iterator i; + list<Plugin *>::iterator j; + + // refresh previously selected plugin to delete red borders. + Plugin* oldPlug = selectedPlugin; + selectedPlugin = newSelected; + if(!selectedPlugin) + { + selectedTrack = 0x0; + WasDragging = false; + } + else + { + for (i = RackTracks.begin(); i != RackTracks.end(); i++) + for (j = (*i)->Racks.begin(); j != (*i)->Racks.end(); j++) + if (*j == newSelected) + { + selectedTrack = *i; + selectedTrack->SetSelected(selectedPlugin); + selectedPlugin->Refresh(); + return; + } + } + // refresh once plugin is deselected + if (oldPlug) + oldPlug->Refresh(); } - else if (selectedPlugin != p) +} + +void Rack::OnMotion(wxMouseEvent &event) +{ + // we have to compute destination values + // considering event having absolute coords (rack window) + if (WasDragging && event.Dragging()) { - selectedPlugin = p; - for (i = RackTracks.begin(); i != RackTracks.end(); i++) - for (j = (*i)->Racks.begin(); j != (*i)->Racks.end(); j++) - if (*j == p) - { - selectedTrack = *i; - selectedTrack->SetSelected(selectedPlugin); - return; - } + int tmp_x = event.GetPosition().x - OldX; + int tmp_y = event.GetPosition().y - OldY; + + if(tmp_x < 0) + tmp_x = 0; + if(tmp_y < 0) + tmp_y = 0; + selectedPlugin->Move(wxPoint(tmp_x, tmp_y)); } } -void Rack::OnMotion(wxMouseEvent &event) +void Rack::HandleMotionEvent(Plugin *plug, wxMouseEvent& event) { - if (selectedPlugin && WasDragging && event.Dragging() && event.LeftIsDown()) - { - int tmp_x = 0; - int tmp_y = 0; + // we have to compute destination values + // considering event having relative coords (plugin window) + if (event.Dragging()) + { + int tmp_x = 0; + int tmp_y = 0; - tmp_x = event.GetPosition().x; - tmp_y = event.GetPosition().y; - if(tmp_x < 0) - tmp_x = 0; - if(tmp_y < 0) - tmp_y = 0; - selectedPlugin->Move(wxPoint(tmp_x, tmp_y)); + // event coords are relative to the window that drag occurs + tmp_x = event.GetPosition().x + plug->GetPosition().x - OldX; + tmp_y = event.GetPosition().y + plug->GetPosition().y - OldY; + if(tmp_x < 0) + tmp_x = 0; + if(tmp_y < 0) + tmp_y = 0; + selectedPlugin->Move(wxPoint(tmp_x, tmp_y)); + WasDragging = true; } - else if (event.LeftUp() && WasDragging) - { - t_ListRackTrack::iterator k; - list<Plugin *>::iterator l; - - new_x = (event.GetPosition().x + selectedPlugin->GetPosition().x); - new_y = (event.GetPosition().y + selectedPlugin->GetPosition().y); - // if IsAudio() is false (plugins can't receive audio): we don't allow chaining - if(selectedPlugin->IsAudio() && !DndGetDest(k, l, new_x, new_y, selectedPlugin)) - { - DeleteRack(selectedPlugin, false); - AddLoadedRack(selectedPlugin); - } - ResizeTracks(); - WasDragging = false; - } } -void Rack::HandleMouseEvent(Plugin *plug, wxMouseEvent *event) +void Rack::HandleWheelEvent(Plugin *plug, wxMouseEvent& event) { - t_ListRackTrack::iterator i; - t_ListRackTrack::iterator k; - list<Plugin *>::iterator j; - list<Plugin *>::iterator l; - new_x = 0; - new_y = 0; - int tmp_x = 0; - int tmp_y = 0; - // manage vertical mousewheel - if (event->GetEventType() == wxEVT_MOUSEWHEEL) - { - int x, y, y1, y2, y3; + int x, y, y1, y2, y3; - GetVirtualSize(0x0, &y1); - GetSize(0x0, &y2); - GetViewStart(&x, &y3); - if (y1 > y2) - { - if (event->GetWheelRotation() > 0) - y = -1; - else - y = 1; - Scroll(x, y3 + y); + GetVirtualSize(0x0, &y1); + GetSize(0x0, &y2); + GetViewStart(&x, &y3); + if (y1 > y2) + { + if (event.GetWheelRotation() > 0) + y = -1; + else + y = 1; + Scroll(x, y3 + y); } - } +} - if (event->Button(wxMOUSE_BTN_ANY)) - { - SetSelected(plug); - } +void Rack::HandleLeftUpEvent(Plugin *plug, wxMouseEvent& event) +{ + SetSelected(plug); + if(WasDragging) + { + t_ListRackTrack::iterator k; + list<Plugin *>::iterator l; - if(event->LeftDown()) - { - OldX = event->GetPosition().x; - OldY = event->GetPosition().y; + int new_x = (event.GetPosition().x + plug->GetPosition().x); + int new_y = (event.GetPosition().y + plug->GetPosition().y); + // if IsAudio() is false (plugins can't receive audio): we don't allow chaining + if(plug->IsAudio() && !DndGetDest(k, l, new_x, new_y, plug)) + { + DeleteRack(plug, false); + AddLoadedRack(plug); + } + ResizeTracks(); + WasDragging = false; + } - Plugin *oldplug = selectedPlugin; - SetSelected(plug); - if (oldplug) - oldplug->Refresh(); +} - new_x = (event->GetPosition().x + plug->GetPosition().x); - new_y = (event->GetPosition().y + plug->GetPosition().y); - } - else if (event->Dragging() && event->LeftIsDown()) - { - tmp_x = event->GetPosition().x + plug->GetPosition().x - OldX; - tmp_y = event->GetPosition().y + plug->GetPosition().y - OldY; - if(tmp_x < 0) - tmp_x = 0; - if(tmp_y < 0) - tmp_y = 0; - plug->Move(wxPoint(tmp_x, tmp_y)); - WasDragging = true; - } +void Rack::HandleLeftDownEvent(Plugin *plug, wxMouseEvent& event) +{ + SetSelected(plug); - if(event->RightDown()) - { - SetSelected(plug); - wxPoint p(event->GetPosition().x + plug->GetPosition().x, event->GetPosition().y + plug->GetPosition().y); - PopupMenu(menu, p.x, p.y); - } - else if(event->LeftUp() && WasDragging) - { - new_x = (event->GetPosition().x + plug->GetPosition().x); - new_y = (event->GetPosition().y + plug->GetPosition().y); - // if IsAudio() is false (plugins can't receive audio): we don't allow chaining - if(plug->IsAudio() && !DndGetDest(k, l, new_x, new_y, plug)) - { - DeleteRack(plug, false); - AddLoadedRack(plug); - } - ResizeTracks(); - WasDragging = false; - } + OldX = event.GetPosition().x; + OldY = event.GetPosition().y; } +void Rack::HandleRightDownEvent(Plugin *plug, wxMouseEvent& event) +{ + wxPoint p(event.GetPosition().x + plug->GetPosition().x, event.GetPosition().y + plug->GetPosition().y); + SetSelected(plug); + PopupMenu(menu, p.x, p.y); +} + void Rack::AddPlugToMenu() { vector<PluginLoader *>::iterator i; @@ -416,28 +407,27 @@ } // called from OnPaint()'s plugins (via HostCallback) -void Rack::HandlePaintEvent(Plugin *plug, wxPaintEvent *event) +void Rack::HandlePaintEvent(Plugin *plug, wxPaintEvent& event) { - int xx, yy; - - CalcScrolledPosition(0, 0, &xx, &yy); - if (selectedPlugin == 0x0) - return; + // we add the red border only on selectedPlugin if (selectedPlugin == plug) { - wxPaintDC dc(selectedPlugin); + int xx, yy; + wxPaintDC dc(plug); + PrepareDC(dc); dc.SetPen(wxPen(wxColour(255,0,0), 3, wxSOLID)); dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(0 - xx, 0 - yy, selectedPlugin->GetSize().x, selectedPlugin->GetSize().y); + CalcScrolledPosition(0, 0, &xx, &yy); + dc.DrawRectangle(0 - xx, 0 - yy, plug->GetSize().x, plug->GetSize().y); } } // we got new_x and new_y which are mouse dropped positions bool Rack::DndGetDest(t_ListRackTrack::iterator &k, list<Plugin *>::iterator &l, - int &new_x, - int &new_y, + int &dest_x, + int &dest_y, Plugin *plug) { int pos_x = 0; @@ -450,13 +440,13 @@ { // for each RackTrack, we look x coord and width of the Rack pos_x = (pos_x + (*k)->Units * UNIT_W); - if((((pos_x + xx)- ((*k)->Units * UNIT_W)) < new_x) && (new_x < (pos_x + xx)) ) + if((((pos_x + xx)- ((*k)->Units * UNIT_W)) < dest_x) && (dest_x < (pos_x + xx)) ) { // for each Rack linked to the RackTrack, we look y coord and height of the Rack for(l = (*k)->Racks.begin(); l != (*k)->Racks.end(); l++) { pos_y = pos_y + (*l)->InitInfo->UnitsY * UNIT_H; - if((((pos_y + yy) - ((*l)->InitInfo->UnitsY * UNIT_H)) < new_y) && (new_y < (pos_y + yy))) + if((((pos_y + yy) - ((*l)->InitInfo->UnitsY * UNIT_H)) < dest_y) && (dest_y < (pos_y + yy))) { if((*l) == plug) return true; @@ -604,9 +594,9 @@ } -void Rack::HandleKeyEvent(Plugin *plug, wxKeyEvent *event) +void Rack::HandleKeyEvent(Plugin *plug, wxKeyEvent& event) { - if (event->GetKeyCode() == WXK_DOWN) + if (event.GetKeyCode() == WXK_DOWN) { //cout << "[RACKPANEL] key received: down arrow" << endl; } Modified: trunk/wired/src/gui/Rack.h =================================================================== --- trunk/wired/src/gui/Rack.h 2010-05-03 17:34:56 UTC (rev 1567) +++ trunk/wired/src/gui/Rack.h 2010-05-03 19:22:39 UTC (rev 1568) @@ -119,13 +119,19 @@ void AddPlugToMenu(); // bool ProcessEvent(wxEvent& event); - // Handles all mouse events void OnMotion(wxMouseEvent &event); - void HandleMouseEvent(Plugin *plug, wxMouseEvent *event); + + // Handles all mouse events from plugins + void HandleMotionEvent(Plugin *plug, wxMouseEvent& event); + void HandleWheelEvent(Plugin *plug, wxMouseEvent& event); + void HandleLeftUpEvent(Plugin *plug, wxMouseEvent& event); + void HandleLeftDownEvent(Plugin *plug, wxMouseEvent& event); + void HandleRightDownEvent(Plugin *plug, wxMouseEvent& event); + // Handles key events - void HandleKeyEvent(Plugin *plug, wxKeyEvent *event); + void HandleKeyEvent(Plugin *plug, wxKeyEvent& event); // Handles all paint events like onPaint ??? - void HandlePaintEvent(Plugin *plug, wxPaintEvent *event); + void HandlePaintEvent(Plugin *plug, wxPaintEvent& event); // Draws the selection rectangle void SetAudioConfig(long bufferSize, double samplingRate); @@ -139,8 +145,6 @@ int OldX; int OldY; - int new_x; - int new_y; int fd_size; bool is_cut; Modified: trunk/wired/src/plugins/HostCallback.cpp =================================================================== --- trunk/wired/src/plugins/HostCallback.cpp 2010-05-03 17:34:56 UTC (rev 1567) +++ trunk/wired/src/plugins/HostCallback.cpp 2010-05-03 19:22:39 UTC (rev 1568) @@ -50,11 +50,26 @@ switch (param) { - case wiredSendMouseEvent : - RackPanel->HandleMouseEvent(plug, (wxMouseEvent *)value); + case wiredSendMotionEvent : + RackPanel->HandleMotionEvent(plug, *(wxMouseEvent *)value); break; + case wiredSendWheelEvent : + RackPanel->HandleWheelEvent(plug, *(wxMouseEvent *)value); + break; + case wiredSendLeftUpEvent : + RackPanel->HandleLeftUpEvent(plug, *(wxMouseEvent *)value); + break; + case wiredSendLeftDownEvent : + RackPanel->HandleLeftDownEvent(plug, *(wxMouseEvent *)value); + break; + case wiredSendRightDownEvent : + RackPanel->HandleRightDownEvent(plug, *(wxMouseEvent *)value); + break; + case wiredSendKeyEvent : + RackPanel->HandleKeyEvent(plug, *(wxKeyEvent *)value); + break; case wiredSendPaintEvent : - RackPanel->HandlePaintEvent(plug, (wxPaintEvent *)value); + RackPanel->HandlePaintEvent(plug, *(wxPaintEvent *)value); break; case wiredAskUpdateGui : MainWin->AddUpdatePlugin(plug); @@ -84,9 +99,6 @@ HelpWin->Help->Load_Text((*(wxString *)value)); break; } - case wiredSendKeyEvent : - RackPanel->HandleKeyEvent(plug, (wxKeyEvent *)value); - break; case wiredGetBpm : *(float *)value = Seq->BPM; break; Modified: trunk/wired/src/redist/Plugin.cpp =================================================================== --- trunk/wired/src/redist/Plugin.cpp 2010-05-03 17:34:56 UTC (rev 1567) +++ trunk/wired/src/redist/Plugin.cpp 2010-05-03 19:22:39 UTC (rev 1568) @@ -8,49 +8,69 @@ /* DO NOT MODIFY THIS FILE FOR MAKING A PLUGIN. JUST DERIVE FROM THAT CLASS */ -Plugin::Plugin(PlugStartInfo &startinfo, PlugInitInfo *initinfo) +Plugin::Plugin(PlugStartInfo &startinfo, PlugInitInfo *initinfo) : wxWindow(startinfo.Rack, -1, startinfo.Pos, startinfo.Size) -{ +{ InitInfo = initinfo; StartInfo = startinfo; - if (InitInfo) + if (InitInfo) InitInfo->UniqueExternalId = 0; Connect(wxID_ANY, wxEVT_KEY_DOWN, (wxObjectEventFunction)(wxEventFunction) &Plugin::OnKeyEvent); Connect(wxID_ANY, wxEVT_MOUSEWHEEL, (wxObjectEventFunction)(wxEventFunction) - &Plugin::OnMouseEvent); + &Plugin::OnWheelEvent); Connect(wxID_ANY, wxEVT_LEFT_DOWN, (wxObjectEventFunction)(wxEventFunction) - &Plugin::OnMouseEvent); + &Plugin::OnLeftDownEvent); Connect(wxID_ANY, wxEVT_LEFT_UP, (wxObjectEventFunction)(wxEventFunction) - &Plugin::OnMouseEvent); + &Plugin::OnLeftUpEvent); Connect(wxID_ANY, wxEVT_MOTION, (wxObjectEventFunction)(wxEventFunction) - &Plugin::OnMouseEvent); + &Plugin::OnMotionEvent); Connect(wxID_ANY, wxEVT_RIGHT_DOWN, (wxObjectEventFunction)(wxEventFunction) - &Plugin::OnMouseEvent); + &Plugin::OnRightDownEvent); // Connect(wxID_ANY, wxEVT_PAINT, (wxObjectEventFunction)(wxEventFunction) // &Plugin::OnPaintEvent); } -Plugin::~Plugin() -{ +Plugin::~Plugin() +{ if (!Disconnect()) cerr << "[PLUGIN] error disconnecting interface" << endl; CloseOptionalView(); } -void Plugin::OnMouseEvent(wxMouseEvent &event) +void Plugin::OnMotionEvent(wxMouseEvent &event) { - SendMouseEvent(event); + StartInfo.HostCallback(this, wiredSendMotionEvent, (void*)&event); } +void Plugin::OnWheelEvent(wxMouseEvent &event) +{ + StartInfo.HostCallback(this, wiredSendWheelEvent, (void*)&event); +} + +void Plugin::OnLeftUpEvent(wxMouseEvent &event) +{ + StartInfo.HostCallback(this, wiredSendLeftUpEvent, (void*)&event); +} + +void Plugin::OnLeftDownEvent(wxMouseEvent &event) +{ + StartInfo.HostCallback(this, wiredSendLeftDownEvent, (void*)&event); +} + +void Plugin::OnRightDownEvent(wxMouseEvent &event) +{ + StartInfo.HostCallback(this, wiredSendRightDownEvent, (void*)&event); +} + void Plugin::OnKeyEvent(wxKeyEvent &event) { - SendKeyEvent(event); + StartInfo.HostCallback(this, wiredSendKeyEvent, (void *)&event); } void Plugin::OnPaintEvent(wxPaintEvent &event) { - SendPaintEvent(event); + StartInfo.HostCallback(this, wiredSendPaintEvent, (void *)&event); } // Time events @@ -115,29 +135,9 @@ StartInfo.HostCallback(this, wiredSendHelp, (void *)&str); } -void Plugin::SendMouseEvent(wxMouseEvent &event) -{ - StartInfo.HostCallback(this, wiredSendMouseEvent, (void *)&event); -} - -void Plugin::SendKeyEvent(wxKeyEvent &event) -{ - StartInfo.HostCallback(this, wiredSendKeyEvent, (void *)&event); -} - -void Plugin::SendClickEvent(wxMouseEvent &event) -{ - StartInfo.HostCallback(this, wiredSendClickEvent, (void *)&event); -} - -void Plugin::SendPaintEvent(wxPaintEvent &event) -{ - StartInfo.HostCallback(this, wiredSendPaintEvent, (void *)&event); -} - bool Plugin::ShowMidiController(int *MidiData[3]) { - StartInfo.HostCallback(this, wiredShowMidiController, (void *)MidiData); + StartInfo.HostCallback(this, wiredShowMidiController, (void *)MidiData); if (*MidiData[0] == -1) return (false); return (true); @@ -153,7 +153,7 @@ StartInfo.HostCallback(this, wiredCloseOptionalView, 0x0); } -wxString Plugin::OpenFileLoader(wxString title, +wxString Plugin::OpenFileLoader(wxString title, std::vector<wxString> *exts, bool akai) { @@ -164,7 +164,7 @@ bool ak; wxString result; } w_filel; - + w_filel.t = title; w_filel.e = exts; w_filel.ak = akai; @@ -172,7 +172,7 @@ return (w_filel.result); } -wxString Plugin::SaveFileLoader(wxString title, +wxString Plugin::SaveFileLoader(wxString title, std::vector<wxString> *exts) { struct @@ -181,7 +181,7 @@ std::vector<wxString> *e; wxString result; } w_filel; - + w_filel.t = title; w_filel.e = exts; StartInfo.HostCallback(this, wiredSaveFileLoader, (void *)&w_filel); @@ -193,7 +193,7 @@ { wxString s; - StartInfo.HostCallback(0x0, wiredHostProductName, (void *)&s); + StartInfo.HostCallback(0x0, wiredHostProductName, (void *)&s); return (s); } @@ -209,16 +209,16 @@ { wxString s; - StartInfo.HostCallback(0x0, wiredHostVendorName, (void *)&s); + StartInfo.HostCallback(0x0, wiredHostVendorName, (void *)&s); return (s); } wxString Plugin::GetDataDir() { wxString s; - - StartInfo.HostCallback(0x0, wiredGetDataDir, (void *)&s); - return (s); + + StartInfo.HostCallback(0x0, wiredGetDataDir, (void *)&s); + return (s); } bool Plugin::CreateMidiPattern(std::list<SeqCreateEvent *> *l) @@ -257,7 +257,7 @@ _Data[Name] = Value; return true; } - return false; + return false; } const char *WiredPluginData::LoadValue(const wxString& Name) Modified: trunk/wired/src/redist/Plugin.h =================================================================== --- trunk/wired/src/redist/Plugin.h 2010-05-03 17:34:56 UTC (rev 1567) +++ trunk/wired/src/redist/Plugin.h 2010-05-03 19:22:39 UTC (rev 1568) @@ -16,8 +16,8 @@ #ifndef WX_PRECOMP #include <wx/wx.h> #endif -#include <string> -#include <list> +#include <string> +#include <list> #include <vector> #include <map> #include "Plugin.h" @@ -45,10 +45,10 @@ #define WIRED_MAKE_STR(x, y) { x[0] = y[0]; x[1] = y[1]; x[2] = y[2]; x[3] = y[3]; } /* You need to return this struct to the host when it calls the 'init' function */ -typedef struct +typedef struct { // ID of your plugin. Must be *unique* AND ALPHA (not numeric) - char UniqueId[4]; + char UniqueId[4]; // ID of an external plugin. Must not be filled if you want to comply with Wired Old API unsigned long UniqueExternalId; @@ -85,12 +85,12 @@ #define WIRED_MIDI_EVENT 1 /* Structure that is passed when your plugin receives an event (such as MIDI messages) */ -typedef struct +typedef struct { // Event type (i.e WIRED_MIDI_EVENT above) - long Type; + long Type; // The number of frames the event will start on next call to Process() - long DeltaFrames; + long DeltaFrames; // The note length (usually 0, look for note off messages to know the end of a note long NoteLength; // The MIDI data @@ -101,11 +101,11 @@ typedef struct s_SeqCreateEvent { // position relative to pattern position - double Position; + double Position; // length of message - double EndPosition; + double EndPosition; // MIDI Data - int MidiMsg[3]; + int MidiMsg[3]; } SeqCreateEvent; // Parameters code list @@ -119,9 +119,12 @@ // User interface events wiredSendHelp, - wiredSendMouseEvent, + wiredSendMotionEvent, + wiredSendWheelEvent, + wiredSendLeftUpEvent, + wiredSendLeftDownEvent, + wiredSendRightDownEvent, wiredSendKeyEvent, - wiredSendClickEvent, wiredSendPaintEvent, wiredShowOptionalView, wiredCloseOptionalView, @@ -143,7 +146,7 @@ wiredCreateMidiPattern }; -/* Parameter class, used for Wired with Xml compatibility. +/* Parameter class, used for Wired with Xml compatibility. The only two methods you must know are SaveValue and LoadValue. */ @@ -194,25 +197,25 @@ /* Called when the host stopped the sequencer */ virtual void Stop() {} - /* Called by the host when the plugin needs to load existing parameters (such as in a - .wrd file. 'fd' is the file descriptor of the file placed at the correct position, + /* Called by the host when the plugin needs to load existing parameters (such as in a + .wrd file. 'fd' is the file descriptor of the file placed at the correct position, where the plugin should read 'size' bytes of data. */ virtual void Load(int fd, long size) {} - // ...and the xml-compatible one... + // ...and the xml-compatible one... virtual void Load(WiredPluginData& Datas){} - /* Called by the host when the plugin needs to save its parameters. This function + /* Called by the host when the plugin needs to save its parameters. This function should return the size of the data that was written in file descriptor 'fd' */ virtual long Save(int fd) { return (0); } - + // ...and the xml-compatible one... virtual void Save(WiredPluginData& Datas) {} - /* Called when the buffer size of the host changes (it is also called after + /* Called when the buffer size of the host changes (it is also called after initialization of the plugin */ virtual void SetBufferSize(long size) {} - /* Called when the sample rate of the host changes (it is also called after + /* Called when the sample rate of the host changes (it is also called after initialization of the plugin */ virtual void SetSamplingRate(double rate) {} /* Called by the host when the BPM changes */ @@ -222,9 +225,9 @@ /* This is were you do your processing. 'input' is the data you have to process (or not if you are making an instrument) and 'output' whre you should place the - processed or generated. 'input' and 'output' contains two buffers (for stereo) which + processed or generated. 'input' and 'output' contains two buffers (for stereo) which contains 'sample_length' elements */ - virtual void Process(float **input, float **output, long sample_length) + virtual void Process(float **input, float **output, long sample_length) { long i; for (i = 0; i < sample_length; i++) @@ -240,10 +243,10 @@ /* Called by the host to know if the plugin has an optional view or not */ virtual bool HasView() { return false; } /* Called by the host to create the optional view */ - virtual wxWindow *CreateView(wxWindow *zone, wxPoint &pos, wxSize &size) { return 0x0; } + virtual wxWindow *CreateView(wxWindow *zone, wxPoint &pos, wxSize &size) { return 0x0; } /* Called when the optional view needs to be destroyed */ virtual void DestroyView() {} - + /* Is plugin supporting audio data to be sent to it ? */ virtual bool IsAudio() = 0; /* Is plugin supporting MIDI data to be sent to it ? */ @@ -265,13 +268,30 @@ virtual wxString DefaultName() { return _("Rack"); } /* Returns a 32x16 bitmap used for displaying the connected to track plugin */ - virtual wxBitmap *GetBitmap() = 0; + virtual wxBitmap *GetBitmap() = 0; /* Used to know if a keyboard event occured. No need to overload */ + /* Tells the host that a key event occured */ virtual void OnKeyEvent(wxKeyEvent &event); + /* Used to know if a mouse event occured. No need to overload */ - virtual void OnMouseEvent(wxMouseEvent &event); + /* Tells the host that a mouse event occured */ + virtual void OnMotionEvent(wxMouseEvent &event); + /* Used to know if a mouse event occured. No need to overload */ + /* Tells the host that a mouse event occured */ + virtual void OnWheelEvent(wxMouseEvent &event); + /* Used to know if a mouse event occured. No need to overload */ + /* Tells the host that a mouse event occured */ + virtual void OnLeftUpEvent(wxMouseEvent &event); + /* Used to know if a mouse event occured. No need to overload */ + /* Tells the host that a mouse event occured */ + virtual void OnLeftDownEvent(wxMouseEvent &event); + /* Used to know if a mouse event occured. No need to overload */ + /* Tells the host that a mouse event occured */ + virtual void OnRightDownEvent(wxMouseEvent &event); + /* Used to know if a paint event occured. No need to overload */ + /* Tells the host that the plugin needs to be paint */ virtual void OnPaintEvent(wxPaintEvent &event); // Time events @@ -295,19 +315,11 @@ void SetNumberOfParameters(int value); wxString GetParameterName(int index); */ - + // User interface events /* Send help wxString to the Wired help window */ void SendHelp(wxString str); - /* Tells the host that a mouse event occured */ - void SendMouseEvent(wxMouseEvent &event); - /* Tells the host that a key event occured */ - void SendKeyEvent(wxKeyEvent &event); - /* Tells the host that the plugin got selected */ - void SendClickEvent(wxMouseEvent &event); - /* Tells the host that the plugin needs to be paint */ - void SendPaintEvent(wxPaintEvent &event); /* Shows MIDI controller change window, if returns true, MidiData will be filled by the MIDI data received (you need to pass a valid pointer to a int[3] variable */ @@ -319,16 +331,16 @@ void CloseOptionalView(); /* Opens the Wired file loader with given title, extensions, and if it should read - AKAI audio cds/files or not. Returns the selected file name or an empty wstring if + AKAI audio cds/files or not. Returns the selected file name or an empty wstring if cancelled. If 'exts' is NULL, default audio extensions are used. */ - wxString OpenFileLoader(wxString title, - std::vector<wxString> *exts, + wxString OpenFileLoader(wxString title, + std::vector<wxString> *exts, bool akai = false); /* Opens the Wired file loader with given title, extensions, for saving a file. Returns the file name or an empty wstring if cancelled */ - wxString SaveFileLoader(wxString title, + wxString SaveFileLoader(wxString title, std::vector<wxString> *exts); - + // Host info /* Returns the host product name */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2010-05-03 17:35:02
|
Revision: 1567 http://wired.svn.sourceforge.net/wired/?rev=1567&view=rev Author: hdoomsday Date: 2010-05-03 17:34:56 +0000 (Mon, 03 May 2010) Log Message: ----------- [CLEAN] Code moved from header to source file. Modified Paths: -------------- trunk/wired/src/engine/AudioEngine.cpp trunk/wired/src/engine/AudioEngine.h Modified: trunk/wired/src/engine/AudioEngine.cpp =================================================================== --- trunk/wired/src/engine/AudioEngine.cpp 2010-04-10 21:42:44 UTC (rev 1566) +++ trunk/wired/src/engine/AudioEngine.cpp 2010-05-03 17:34:56 UTC (rev 1567) @@ -31,6 +31,69 @@ /* negative terminated list */ }; +// AudioCallback +int AudioCallback(const void *input, + void *output, + unsigned long frameCount, + const PaStreamCallbackTimeInfo* timeInfo, + PaStreamCallbackFlags statusFlags, + void *userData) +{ + if (!userData) + return (0); + + callback_t *data = (callback_t*)userData; + unsigned long bytes = frameCount, processed = 0; + float **outputs = (float**)output; + float **inputs =(float**)input; + + + int nchan = 0; + vector<int>::iterator chan; + + if (data->SampleFormat & paFloat32) + { + if (data->OutFIFOVector.size() > 0) + { + for (processed = 0, chan = data->Sets->OutputChannels.begin(); + chan != data->Sets->OutputChannels.end(); + chan++, nchan++) + { + processed = data->OutFIFOVector[nchan]->Read(outputs[*chan], bytes); + if (processed < bytes) + for (; processed < bytes; processed++) + outputs[*chan][processed] = 0.f; + } + } + if (data->InFIFOVector.size() > 0) + { + nchan = 0; + for (processed = 0, chan = data->Sets->InputChannels.begin(); + chan != data->Sets->InputChannels.end(); + chan++, nchan++) + { + processed = data->InFIFOVector[nchan]->Write(inputs[*chan], bytes); + /*if (processed != bytes) + cout << "[AUDIO] Frame drop while recording" << endl; + */ + } + } + } + else if ( data->SampleFormat & paInt32 ) + { + ; + } + else if ( data->SampleFormat & paInt24 ) + ; + else if ( data->SampleFormat & paInt16 ) + ; + else if ( data->SampleFormat & paUInt8 ) + ; + else if ( data->SampleFormat & paInt8 ) + ; + return (0); +} + AudioEngine::AudioEngine() { cout << "[AUDIO] AudioEngine construct" << endl; Modified: trunk/wired/src/engine/AudioEngine.h =================================================================== --- trunk/wired/src/engine/AudioEngine.h 2010-04-10 21:42:44 UTC (rev 1566) +++ trunk/wired/src/engine/AudioEngine.h 2010-05-03 17:34:56 UTC (rev 1567) @@ -128,68 +128,13 @@ extern AudioEngine *Audio; // AudioCallback -static int AudioCallback(const void *input, +int AudioCallback(const void *input, void *output, unsigned long frameCount, const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags, - void *userData) -{ - if (!userData) - return (0); + void *userData); - callback_t *data = (callback_t*)userData; - unsigned long bytes = frameCount, processed = 0; - float **outputs = (float**)output; - float **inputs =(float**)input; - - - int nchan = 0; - vector<int>::iterator chan; - - if (data->SampleFormat & paFloat32) - { - if (data->OutFIFOVector.size() > 0) - { - for (processed = 0, chan = data->Sets->OutputChannels.begin(); - chan != data->Sets->OutputChannels.end(); - chan++, nchan++) - { - processed = data->OutFIFOVector[nchan]->Read(outputs[*chan], bytes); - if (processed < bytes) - for (; processed < bytes; processed++) - outputs[*chan][processed] = 0.f; - } - } - if (data->InFIFOVector.size() > 0) - { - nchan = 0; - for (processed = 0, chan = data->Sets->InputChannels.begin(); - chan != data->Sets->InputChannels.end(); - chan++, nchan++) - { - processed = data->InFIFOVector[nchan]->Write(inputs[*chan], bytes); - /*if (processed != bytes) - cout << "[AUDIO] Frame drop while recording" << endl; - */ - } - } - } - else if ( data->SampleFormat & paInt32 ) - { - ; - } - else if ( data->SampleFormat & paInt24 ) - ; - else if ( data->SampleFormat & paInt16 ) - ; - else if ( data->SampleFormat & paUInt8 ) - ; - else if ( data->SampleFormat & paInt8 ) - ; - return (0); -} - // Useful functions for debugging void DumpStereoBuffer(float **buffer); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2010-04-10 21:42:50
|
Revision: 1566 http://wired.svn.sourceforge.net/wired/?rev=1566&view=rev Author: hdoomsday Date: 2010-04-10 21:42:44 +0000 (Sat, 10 Apr 2010) Log Message: ----------- [COMPIL] Added missing STL headers Modified Paths: -------------- trunk/wired/src/gui/MainApp.cpp Modified: trunk/wired/src/gui/MainApp.cpp =================================================================== --- trunk/wired/src/gui/MainApp.cpp 2010-04-10 21:11:43 UTC (rev 1565) +++ trunk/wired/src/gui/MainApp.cpp 2010-04-10 21:42:44 UTC (rev 1566) @@ -1,6 +1,7 @@ // Copyright (C) 2004-2007 by Wired Team // Under the GNU General Public License Version 2, June 1991 +#include <iostream> #include <new> #include <iostream> @@ -29,6 +30,8 @@ #define LOG #endif +using namespace std; + void AllocationErrorHandler(void) { cout << "[MAINAPP] Allocation error or not enough memory, aborting" << endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2010-04-10 21:11:52
|
Revision: 1565 http://wired.svn.sourceforge.net/wired/?rev=1565&view=rev Author: hdoomsday Date: 2010-04-10 21:11:43 +0000 (Sat, 10 Apr 2010) Log Message: ----------- [COMPIL] Moved header to good folder Added Paths: ----------- trunk/wired/src/fileloader/FileConversion.h Removed Paths: ------------- trunk/wired/src/gui/FileConversion.h Copied: trunk/wired/src/fileloader/FileConversion.h (from rev 1564, trunk/wired/src/gui/FileConversion.h) =================================================================== --- trunk/wired/src/fileloader/FileConversion.h (rev 0) +++ trunk/wired/src/fileloader/FileConversion.h 2010-04-10 21:11:43 UTC (rev 1565) @@ -0,0 +1,101 @@ +// Copyright (C) 2004-2007 by Wired Team +// Under the GNU General Public License Version 2, June 1991 + +#ifndef _FILECONVERSION_H_ +#define _FILECONVERSION_H_ + +#include <wx/thread.h> +#include <iostream> +#include <list> +#include <vector> +#include <deque> + +#include "WiredSampleRate.h" +#include "WiredCodec.h" + +#define PROGRESS_DIALOG_UNIT 100 + +using namespace std; + +typedef enum { + AImportWaveFile = 0, + AConvertSampleRate, + AExportWaveFile, + AImportFile +} FileConversionTypeAction; + +typedef struct s_FileConversionAction +{ + FileConversionTypeAction TypeAction; + wxString SrcFileName; + wxString DstFileName; +} FileConversionAction; + +class FileConversion //: public wxThread +{ +public: + FileConversion(); + virtual ~FileConversion(); + FileConversion(const FileConversion& copy){*this = copy;} + FileConversion operator=(const FileConversion& right); + + virtual void *Entry(); + bool Init(t_samplerate_info *RateInit, wxString &WorkingDir, unsigned long BufferSize, wxWindow *Parent); + vector<wxString> *GetCodecsExtensions(); + bool ConvertFromCodec(wxString& FileName); + void ConvertToCodec(wxString& FileName); + bool ConvertSamplerate(wxString& FileName); + bool ConvertSamplerateNoGraph(wxString& FileName); + + // import a wav file + void ImportWaveFile(wxString& FileName); + + // import a file with probably some codec, return false if canceled + bool ImportFile(wxString& FileName); + + void Stop(); + void SetBufferSize(unsigned long Size){_BufferSize = Size; _SampleRateConverter.SetBufferSize(Size);} + void SetSampleRate(unsigned long SampleRate){_SampleRateConverter.SetSampleRate(SampleRate);} + void SetFormat(PaSampleFormat Format){_SampleRateConverter.SetFormat(Format);} +private: + void CopyToWorkingDir(wxString& FileName); + void ImportWavePattern(wxString& FileName); + bool ConvertSamplerate(wxString& FileName, bool &HasChangedPath); + bool ConvertSamplerateNoGraph(wxString& FileName, bool &HasChangedPath); + int GetSndFFormat(PcmType Type); + bool Decode(wxString& FileName); + void EnqueueAction(FileConversionTypeAction ActionType, wxString &SrcFile, wxString &DstFile); + bool _ShouldRun; + WiredSampleRate _SampleRateConverter; + WiredCodec _CodecConverter; + vector<wxString> _CodecsExtensions; + wxString _WorkingDir; + unsigned long _BufferSize; + wxWindow *_Parent; + deque<FileConversionAction *> _ActionsList; + +private: + SNDFILE *OpenDecodeFile(t_Pcm &Data, const wxString &DestFileName, SF_INFO &Info, + unsigned long *TotalReaden, int *sf_write_result); +}; + +static wxMutex FileConversionMutex; + +class AskQuestion +{ +public: + AskQuestion(wxWindow *Parent){_Parent = Parent;} + ~AskQuestion(){}; + + int Ask(const wxString &Question, const wxString &Title) + { + wxMessageDialog msg(_Parent, Question, Title, wxYES_NO | wxCANCEL | wxICON_QUESTION | wxCENTRE); + int res = msg.ShowModal(); + msg.Destroy(); + return res; + } +private: + wxWindow *_Parent; +}; + +#endif /*FILECONVERSION_H_*/ Deleted: trunk/wired/src/gui/FileConversion.h =================================================================== --- trunk/wired/src/gui/FileConversion.h 2009-09-01 07:02:53 UTC (rev 1564) +++ trunk/wired/src/gui/FileConversion.h 2010-04-10 21:11:43 UTC (rev 1565) @@ -1,101 +0,0 @@ -// Copyright (C) 2004-2007 by Wired Team -// Under the GNU General Public License Version 2, June 1991 - -#ifndef _FILECONVERSION_H_ -#define _FILECONVERSION_H_ - -#include <wx/thread.h> -#include <iostream> -#include <list> -#include <vector> -#include <deque> - -#include "WiredSampleRate.h" -#include "WiredCodec.h" - -#define PROGRESS_DIALOG_UNIT 100 - -using namespace std; - -typedef enum { - AImportWaveFile = 0, - AConvertSampleRate, - AExportWaveFile, - AImportFile -} FileConversionTypeAction; - -typedef struct s_FileConversionAction -{ - FileConversionTypeAction TypeAction; - wxString SrcFileName; - wxString DstFileName; -} FileConversionAction; - -class FileConversion //: public wxThread -{ -public: - FileConversion(); - virtual ~FileConversion(); - FileConversion(const FileConversion& copy){*this = copy;} - FileConversion operator=(const FileConversion& right); - - virtual void *Entry(); - bool Init(t_samplerate_info *RateInit, wxString &WorkingDir, unsigned long BufferSize, wxWindow *Parent); - vector<wxString> *GetCodecsExtensions(); - bool ConvertFromCodec(wxString& FileName); - void ConvertToCodec(wxString& FileName); - bool ConvertSamplerate(wxString& FileName); - bool ConvertSamplerateNoGraph(wxString& FileName); - - // import a wav file - void ImportWaveFile(wxString& FileName); - - // import a file with probably some codec, return false if canceled - bool ImportFile(wxString& FileName); - - void Stop(); - void SetBufferSize(unsigned long Size){_BufferSize = Size; _SampleRateConverter.SetBufferSize(Size);} - void SetSampleRate(unsigned long SampleRate){_SampleRateConverter.SetSampleRate(SampleRate);} - void SetFormat(PaSampleFormat Format){_SampleRateConverter.SetFormat(Format);} -private: - void CopyToWorkingDir(wxString& FileName); - void ImportWavePattern(wxString& FileName); - bool ConvertSamplerate(wxString& FileName, bool &HasChangedPath); - bool ConvertSamplerateNoGraph(wxString& FileName, bool &HasChangedPath); - int GetSndFFormat(PcmType Type); - bool Decode(wxString& FileName); - void EnqueueAction(FileConversionTypeAction ActionType, wxString &SrcFile, wxString &DstFile); - bool _ShouldRun; - WiredSampleRate _SampleRateConverter; - WiredCodec _CodecConverter; - vector<wxString> _CodecsExtensions; - wxString _WorkingDir; - unsigned long _BufferSize; - wxWindow *_Parent; - deque<FileConversionAction *> _ActionsList; - -private: - SNDFILE *OpenDecodeFile(t_Pcm &Data, const wxString &DestFileName, SF_INFO &Info, - unsigned long *TotalReaden, int *sf_write_result); -}; - -static wxMutex FileConversionMutex; - -class AskQuestion -{ -public: - AskQuestion(wxWindow *Parent){_Parent = Parent;} - ~AskQuestion(){}; - - int Ask(const wxString &Question, const wxString &Title) - { - wxMessageDialog msg(_Parent, Question, Title, wxYES_NO | wxCANCEL | wxICON_QUESTION | wxCENTRE); - int res = msg.ShowModal(); - msg.Destroy(); - return res; - } -private: - wxWindow *_Parent; -}; - -#endif /*FILECONVERSION_H_*/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-09-01 07:03:01
|
Revision: 1564 http://wired.svn.sourceforge.net/wired/?rev=1564&view=rev Author: hdoomsday Date: 2009-09-01 07:02:53 +0000 (Tue, 01 Sep 2009) Log Message: ----------- [GUI] Fixed: if we drag and drop too fast plugins, rack moving stopped. Modified Paths: -------------- trunk/wired/src/gui/Rack.cpp trunk/wired/src/gui/Rack.h Modified: trunk/wired/src/gui/Rack.cpp =================================================================== --- trunk/wired/src/gui/Rack.cpp 2009-08-31 09:48:45 UTC (rev 1563) +++ trunk/wired/src/gui/Rack.cpp 2009-09-01 07:02:53 UTC (rev 1564) @@ -282,6 +282,39 @@ } } +void Rack::OnMotion(wxMouseEvent &event) +{ + if (selectedPlugin && WasDragging && event.Dragging() && event.LeftIsDown()) + { + int tmp_x = 0; + int tmp_y = 0; + + tmp_x = event.GetPosition().x; + tmp_y = event.GetPosition().y; + if(tmp_x < 0) + tmp_x = 0; + if(tmp_y < 0) + tmp_y = 0; + selectedPlugin->Move(wxPoint(tmp_x, tmp_y)); + } + else if (event.LeftUp() && WasDragging) + { + t_ListRackTrack::iterator k; + list<Plugin *>::iterator l; + + new_x = (event.GetPosition().x + selectedPlugin->GetPosition().x); + new_y = (event.GetPosition().y + selectedPlugin->GetPosition().y); + // if IsAudio() is false (plugins can't receive audio): we don't allow chaining + if(selectedPlugin->IsAudio() && !DndGetDest(k, l, new_x, new_y, selectedPlugin)) + { + DeleteRack(selectedPlugin, false); + AddLoadedRack(selectedPlugin); + } + ResizeTracks(); + WasDragging = false; + } +} + void Rack::HandleMouseEvent(Plugin *plug, wxMouseEvent *event) { t_ListRackTrack::iterator i; @@ -293,6 +326,7 @@ int tmp_x = 0; int tmp_y = 0; + // manage vertical mousewheel if (event->GetEventType() == wxEVT_MOUSEWHEEL) { int x, y, y1, y2, y3; @@ -309,16 +343,10 @@ Scroll(x, y3 + y); } } - else if (event->Dragging() && event->LeftIsDown()) + + if (event->Button(wxMOUSE_BTN_ANY)) { - tmp_x = event->GetPosition().x + plug->GetPosition().x - OldX; - tmp_y = event->GetPosition().y + plug->GetPosition().y - OldY; - if(tmp_x < 0) - tmp_x = 0; - if(tmp_y < 0) - tmp_y = 0; - plug->Move(wxPoint(tmp_x, tmp_y)); - WasDragging = true; + SetSelected(plug); } if(event->LeftDown()) @@ -334,6 +362,18 @@ new_x = (event->GetPosition().x + plug->GetPosition().x); new_y = (event->GetPosition().y + plug->GetPosition().y); } + else if (event->Dragging() && event->LeftIsDown()) + { + tmp_x = event->GetPosition().x + plug->GetPosition().x - OldX; + tmp_y = event->GetPosition().y + plug->GetPosition().y - OldY; + if(tmp_x < 0) + tmp_x = 0; + if(tmp_y < 0) + tmp_y = 0; + plug->Move(wxPoint(tmp_x, tmp_y)); + WasDragging = true; + } + if(event->RightDown()) { SetSelected(plug); @@ -647,11 +687,6 @@ } } -void Rack::OnClick(wxMouseEvent &event) -{ - -} - void Rack::Dump() { t_ListRackTrack::const_iterator iter; @@ -813,6 +848,7 @@ // Events loop (Static events) BEGIN_EVENT_TABLE(Rack, wxScrolledWindow) EVT_ENTER_WINDOW(Rack::OnHelp) + EVT_MOTION(Rack::OnMotion) // EVT_LEFT_DOWN(Rack::OnClick) // EVT_RIGHT_DOWN(Rack::OnClick) // EVT_LEFT_UP(Rack::OnClick) @@ -853,13 +889,13 @@ DeleteRackAction::~DeleteRackAction() { - RackPanel->DeleteRack( _deleted, true ); + RackPanel->DeleteRack( _deleted, true ); } bool DeleteRackAction::Do () { _deleted->Hide(); - return RackPanel->DeleteRack( _deleted, false ); + return RackPanel->DeleteRack( _deleted, false ); } bool DeleteRackAction::Undo () Modified: trunk/wired/src/gui/Rack.h =================================================================== --- trunk/wired/src/gui/Rack.h 2009-08-31 09:48:45 UTC (rev 1563) +++ trunk/wired/src/gui/Rack.h 2009-09-01 07:02:53 UTC (rev 1564) @@ -119,8 +119,8 @@ void AddPlugToMenu(); // bool ProcessEvent(wxEvent& event); - // Handles all mouse events + void OnMotion(wxMouseEvent &event); void HandleMouseEvent(Plugin *plug, wxMouseEvent *event); // Handles key events void HandleKeyEvent(Plugin *plug, wxKeyEvent *event); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-08-31 09:48:55
|
Revision: 1563 http://wired.svn.sourceforge.net/wired/?rev=1563&view=rev Author: hdoomsday Date: 2009-08-31 09:48:45 +0000 (Mon, 31 Aug 2009) Log Message: ----------- [COMPAT] Added and fixed all plugins projects in CodeBlocks files. Modified Paths: -------------- trunk/wired/win32/CodeBlocks/Wired.workspace trunk/wired/win32/CodeBlocks/libWiredBeatBox.cbp trunk/wired/win32/CodeBlocks/libWiredCrusher.cbp trunk/wired/win32/CodeBlocks/libWiredDelay.cbp trunk/wired/win32/CodeBlocks/libWiredReverb.cbp Added Paths: ----------- trunk/wired/win32/CodeBlocks/libWiredCompressor.cbp trunk/wired/win32/CodeBlocks/libWiredFilter.cbp trunk/wired/win32/CodeBlocks/libWiredSynth.cbp Modified: trunk/wired/win32/CodeBlocks/Wired.workspace =================================================================== --- trunk/wired/win32/CodeBlocks/Wired.workspace 2009-08-28 15:49:51 UTC (rev 1562) +++ trunk/wired/win32/CodeBlocks/Wired.workspace 2009-08-31 09:48:45 UTC (rev 1563) @@ -15,5 +15,8 @@ <Depends filename="libWiredAkai.cbp" /> </Project> <Project filename="libWiredAkai.cbp" /> + <Project filename="libWiredCompressor.cbp" /> + <Project filename="libWiredFilter.cbp" /> + <Project filename="libWiredSynth.cbp" /> </Workspace> </CodeBlocks_workspace_file> Modified: trunk/wired/win32/CodeBlocks/libWiredBeatBox.cbp =================================================================== --- trunk/wired/win32/CodeBlocks/libWiredBeatBox.cbp 2009-08-28 15:49:51 UTC (rev 1562) +++ trunk/wired/win32/CodeBlocks/libWiredBeatBox.cbp 2009-08-31 09:48:45 UTC (rev 1563) @@ -7,7 +7,7 @@ <Option compiler="gcc" /> <Build> <Target title="Debug"> - <Option output=".\bin\plugins\libWiredBeatBox.dll" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\plugins\libWiredBeatBox" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Debug\" /> <Option type="3" /> <Option compiler="gcc" /> @@ -16,7 +16,7 @@ </Compiler> </Target> <Target title="Release"> - <Option output=".\bin\plugins\libWiredBeatBox.dll" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\plugins\libWiredBeatBox" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Release\" /> <Option type="3" /> <Option compiler="gcc" /> @@ -39,6 +39,7 @@ <Add directory="..\..\src\save" /> <Add directory="..\..\src\xml" /> <Add directory="..\..\src" /> + <Add directory="..\..\src\engine" /> </Compiler> <Linker> <Add library="wx_msw-2.8" /> @@ -73,6 +74,7 @@ <Unit filename="..\..\src\xml\WiredXml.h" /> <Extensions> <code_completion /> + <debugger /> </Extensions> </Project> </CodeBlocks_project_file> Added: trunk/wired/win32/CodeBlocks/libWiredCompressor.cbp =================================================================== --- trunk/wired/win32/CodeBlocks/libWiredCompressor.cbp (rev 0) +++ trunk/wired/win32/CodeBlocks/libWiredCompressor.cbp 2009-08-31 09:48:45 UTC (rev 1563) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="libWiredCompressor" /> + <Option pch_mode="2" /> + <Option compiler="gcc" /> + <Build> + <Target title="Debug"> + <Option output=".\bin\plugins\libWiredCompressor.dll" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug\" /> + <Option type="3" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-g" /> + </Compiler> + </Target> + <Target title="Release"> + <Option output=".\bin\plugins\libWiredCompressor.dll" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release\" /> + <Option type="3" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-O2" /> + </Compiler> + <Linker> + <Add option="-s" /> + </Linker> + </Target> + </Build> + <Compiler> + <Add option="-Wall" /> + <Add option="-DWXUSINGDLL" /> + <Add option="-D__WXMSW__" /> + <Add directory="..\..\src\redist" /> + <Add directory="..\..\src\libs\WiredWidgets\src" /> + <Add directory="..\..\src\midi" /> + <Add directory="..\..\src\save" /> + <Add directory="..\..\src\xml" /> + </Compiler> + <Linker> + <Add library="wx_msw-2.8" /> + <Add library="WiredWidgets" /> + <Add directory="bin" /> + </Linker> + <Unit filename="..\..\src\plugins\compressor\CompressorPlug.cpp" /> + <Unit filename="..\..\src\plugins\compressor\CompressorPlug.h" /> + <Unit filename="..\..\src\redist\Plugin.cpp" /> + <Unit filename="..\..\src\redist\Plugin.h" /> + <Extensions> + <code_completion /> + </Extensions> + </Project> +</CodeBlocks_project_file> Modified: trunk/wired/win32/CodeBlocks/libWiredCrusher.cbp =================================================================== --- trunk/wired/win32/CodeBlocks/libWiredCrusher.cbp 2009-08-28 15:49:51 UTC (rev 1562) +++ trunk/wired/win32/CodeBlocks/libWiredCrusher.cbp 2009-08-31 09:48:45 UTC (rev 1563) @@ -7,7 +7,7 @@ <Option compiler="gcc" /> <Build> <Target title="Debug"> - <Option output=".\bin\plugins\libWiredCrusher.dll" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\plugins\libWiredCrusher" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Debug\" /> <Option type="3" /> <Option compiler="gcc" /> @@ -16,7 +16,7 @@ </Compiler> </Target> <Target title="Release"> - <Option output=".\bin\plugins\libWiredCrusher.dll" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\plugins\libWiredCrusher" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Release\" /> <Option type="3" /> <Option compiler="gcc" /> @@ -35,6 +35,8 @@ <Add directory="..\..\src\redist" /> <Add directory="..\..\src\libs\WiredWidgets\src" /> <Add directory="..\..\src\midi" /> + <Add directory="..\..\src\save" /> + <Add directory="..\..\src\xml" /> </Compiler> <Linker> <Add library="wx_msw-2.8" /> @@ -46,6 +48,7 @@ <Unit filename="..\..\src\redist\Plugin.h" /> <Extensions> <code_completion /> + <debugger /> </Extensions> </Project> </CodeBlocks_project_file> Modified: trunk/wired/win32/CodeBlocks/libWiredDelay.cbp =================================================================== --- trunk/wired/win32/CodeBlocks/libWiredDelay.cbp 2009-08-28 15:49:51 UTC (rev 1562) +++ trunk/wired/win32/CodeBlocks/libWiredDelay.cbp 2009-08-31 09:48:45 UTC (rev 1563) @@ -7,7 +7,7 @@ <Option compiler="gcc" /> <Build> <Target title="Debug"> - <Option output=".\bin\plugins\libWiredDelay.dll" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\plugins\libWiredDelay" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Debug\" /> <Option type="3" /> <Option compiler="gcc" /> @@ -16,7 +16,7 @@ </Compiler> </Target> <Target title="Release"> - <Option output=".\bin\plugins\libWiredDelay.dll" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\plugins\libWiredDelay" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Release\" /> <Option type="3" /> <Option compiler="gcc" /> @@ -35,6 +35,8 @@ <Add directory="..\..\src\redist" /> <Add directory="..\..\src\libs\WiredWidgets\src" /> <Add directory="..\..\src\midi" /> + <Add directory="..\..\src\save" /> + <Add directory="..\..\src\xml" /> </Compiler> <Linker> <Add library="wx_msw-2.8" /> @@ -47,6 +49,7 @@ <Unit filename="..\..\src\redist\Plugin.h" /> <Extensions> <code_completion /> + <debugger /> </Extensions> </Project> </CodeBlocks_project_file> Added: trunk/wired/win32/CodeBlocks/libWiredFilter.cbp =================================================================== --- trunk/wired/win32/CodeBlocks/libWiredFilter.cbp (rev 0) +++ trunk/wired/win32/CodeBlocks/libWiredFilter.cbp 2009-08-31 09:48:45 UTC (rev 1563) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="libWiredFilter" /> + <Option pch_mode="2" /> + <Option compiler="gcc" /> + <Build> + <Target title="Debug"> + <Option output=".\bin\plugins\libWiredFilter.dll" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug\" /> + <Option type="3" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-g" /> + </Compiler> + </Target> + <Target title="Release"> + <Option output=".\bin\plugins\libWiredFilter.dll" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release\" /> + <Option type="3" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-O2" /> + </Compiler> + <Linker> + <Add option="-s" /> + </Linker> + </Target> + </Build> + <Compiler> + <Add option="-Wall" /> + <Add option="-DWXUSINGDLL" /> + <Add option="-D__WXMSW__" /> + <Add directory="..\..\src\redist" /> + <Add directory="..\..\src\libs\WiredWidgets\src" /> + <Add directory="..\..\src\midi" /> + <Add directory="..\..\src\save" /> + <Add directory="..\..\src\xml" /> + </Compiler> + <Linker> + <Add library="wx_msw-2.8" /> + <Add library="WiredWidgets" /> + <Add directory="bin" /> + </Linker> + <Unit filename="..\..\src\plugins\filter\filter.c" /> + <Unit filename="..\..\src\plugins\filter\filter.h" /> + <Unit filename="..\..\src\plugins\filter\FilterPlug.cpp" /> + <Unit filename="..\..\src\plugins\filter\FilterPlug.h" /> + <Unit filename="..\..\src\redist\Plugin.cpp" /> + <Unit filename="..\..\src\redist\Plugin.h" /> + <Extensions> + <code_completion /> + </Extensions> + </Project> +</CodeBlocks_project_file> Modified: trunk/wired/win32/CodeBlocks/libWiredReverb.cbp =================================================================== --- trunk/wired/win32/CodeBlocks/libWiredReverb.cbp 2009-08-28 15:49:51 UTC (rev 1562) +++ trunk/wired/win32/CodeBlocks/libWiredReverb.cbp 2009-08-31 09:48:45 UTC (rev 1563) @@ -7,7 +7,7 @@ <Option compiler="gcc" /> <Build> <Target title="Debug"> - <Option output=".\bin\plugins\libWiredReverb.dll" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\plugins\libWiredReverb" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Debug\" /> <Option type="3" /> <Option compiler="gcc" /> @@ -16,7 +16,7 @@ </Compiler> </Target> <Target title="Release"> - <Option output=".\bin\plugins\libWiredReverb.dll" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\plugins\libWiredReverb" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Release\" /> <Option type="3" /> <Option compiler="gcc" /> @@ -35,6 +35,8 @@ <Add directory="..\..\src\redist" /> <Add directory="..\..\src\libs\WiredWidgets\src" /> <Add directory="..\..\src\midi" /> + <Add directory="..\..\src\save" /> + <Add directory="..\..\src\xml" /> </Compiler> <Linker> <Add library="wx_msw-2.8" /> @@ -61,6 +63,7 @@ <Unit filename="..\..\src\redist\Plugin.h" /> <Extensions> <code_completion /> + <debugger /> </Extensions> </Project> </CodeBlocks_project_file> Added: trunk/wired/win32/CodeBlocks/libWiredSynth.cbp =================================================================== --- trunk/wired/win32/CodeBlocks/libWiredSynth.cbp (rev 0) +++ trunk/wired/win32/CodeBlocks/libWiredSynth.cbp 2009-08-31 09:48:45 UTC (rev 1563) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="libWiredSynth" /> + <Option pch_mode="2" /> + <Option compiler="gcc" /> + <Build> + <Target title="Debug"> + <Option output=".\bin\plugins\libWiredSynth" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug\" /> + <Option type="3" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-g" /> + </Compiler> + </Target> + <Target title="Release"> + <Option output=".\bin\plugins\libWiredSynth" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release\" /> + <Option type="3" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-O2" /> + </Compiler> + <Linker> + <Add option="-s" /> + </Linker> + </Target> + </Build> + <Compiler> + <Add option="-Wall" /> + <Add option="-DWXUSINGDLL" /> + <Add option="-D__WXMSW__" /> + <Add directory="..\..\src\redist" /> + <Add directory="..\..\src\libs\WiredWidgets\src" /> + <Add directory="..\..\src\midi" /> + <Add directory="..\..\src\save" /> + <Add directory="..\..\src\xml" /> + </Compiler> + <Linker> + <Add library="wx_msw-2.8" /> + <Add library="WiredWidgets" /> + <Add directory="bin" /> + </Linker> + <Unit filename="..\..\src\plugins\synth\SynthPlug.cpp" /> + <Unit filename="..\..\src\plugins\synth\SynthPlug.h /> + <Unit filename="..\..\src\plugins\synth\Adsr.cpp /> + <Unit filename="..\..\src\plugins\synth\Adsr.h /> + <Unit filename="..\..\src\plugins\synth\Lfo.cpp /> + <Unit filename="..\..\src\plugins\synth\Lfo.h /> + <Unit filename="..\..\src\plugins\synth\Osc.cpp /> + <Unit filename="..\..\src\plugins\synth\Osc.h /> + <Unit filename="..\..\src\redist\Plugin.cpp" /> + <Unit filename="..\..\src\redist\Plugin.h" /> + <Extensions> + <code_completion /> + <debugger /> + </Extensions> + </Project> +</CodeBlocks_project_file> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-08-28 15:49:59
|
Revision: 1562 http://wired.svn.sourceforge.net/wired/?rev=1562&view=rev Author: hdoomsday Date: 2009-08-28 15:49:51 +0000 (Fri, 28 Aug 2009) Log Message: ----------- [COMPAT] Added compat for win32. Wired can load plugins. Modified Paths: -------------- trunk/wired/src/engine/Settings.cpp trunk/wired/src/engine/Settings.h trunk/wired/src/plugins/PluginLoader.cpp Modified: trunk/wired/src/engine/Settings.cpp =================================================================== --- trunk/wired/src/engine/Settings.cpp 2009-08-28 15:39:01 UTC (rev 1561) +++ trunk/wired/src/engine/Settings.cpp 2009-08-28 15:49:51 UTC (rev 1562) @@ -25,9 +25,17 @@ #ifdef _WIN32 // exemple : C:\\path\\wired_exe_install_dir\\conf ConfDir = wxStandardPaths::Get().GetDataDir() + wxFileName::GetPathSeparator() + wxT("conf\\"); + // exemple : C:\\path\\wired_exe_install_dir\\data + DataDir = wxStandardPaths::Get().GetDataDir() + wxFileName::GetPathSeparator() + wxT("data\\"); + // exemple : C:\\path\\wired_exe_install_dir\\plugins + PlugDir = wxStandardPaths::Get().GetDataDir() + wxFileName::GetPathSeparator() + wxT("plugins\\"); #else // exemple : /usr/etc/wired/ ConfDir = wxString(wxT(SYSCONF_DIR)) + wxFileName::GetPathSeparator(); + // exemple : /usr/share/wired/ + DataDir = wxString(wxT(DATA_DIR)) + wxT("/wired/"); + // exemple : /usr/lib/ + PlugDir = wxString(wxT(LIB_DIR)) + wxFileName::GetPathSeparator(); #endif PlugConfFile = ConfDir + PLUG_CONF_FILE; f.Assign(PlugConfFile); @@ -38,13 +46,6 @@ PlugConfFile = ConfDir + PLUG_CONF_FILE; } -#ifdef _WIN32 - // exemple : C:\\path\\wired_exe_install_dir\\data - DataDir = wxStandardPaths::Get().GetDataDir() + wxFileName::GetPathSeparator() + wxT(DATA_DIR) + wxFileName::GetPathSeparator(); -#else - // exemple : /usr/share/wired/ - DataDir = wxString(wxT(DATA_DIR)) + wxT("/wired/"); -#endif f.Assign(DataDir); if (!f.DirExists()) Modified: trunk/wired/src/engine/Settings.h =================================================================== --- trunk/wired/src/engine/Settings.h 2009-08-28 15:39:01 UTC (rev 1561) +++ trunk/wired/src/engine/Settings.h 2009-08-28 15:49:51 UTC (rev 1562) @@ -160,6 +160,11 @@ wxString DataDir; /** + * Setting a directory of plugins. + */ + wxString PlugDir; + + /** * Setting a working directory. */ wxString WorkingDir; Modified: trunk/wired/src/plugins/PluginLoader.cpp =================================================================== --- trunk/wired/src/plugins/PluginLoader.cpp 2009-08-28 15:39:01 UTC (rev 1561) +++ trunk/wired/src/plugins/PluginLoader.cpp 2009-08-28 15:49:51 UTC (rev 1562) @@ -34,7 +34,7 @@ cerr << "[PLUGINLOADER] Can't create Plugin" << endl; } -PluginLoader::PluginLoader(wxString filename) : +PluginLoader::PluginLoader(wxString filename) : FileName(filename), handle(wxString(wxT(LIB_DIR)) + wxT("/") + filename) { External = false; @@ -44,7 +44,7 @@ if (!handle.IsLoaded()) { cout << "[PLUGLOADER] Warning : " << - wxString(wxString(wxT(LIB_DIR)) + wxT("/") + filename).mb_str() + wxString(WiredSettings->PlugDir + filename).mb_str() << " can't be loaded" << endl; handle.Load(filename); } @@ -58,26 +58,26 @@ #endif init = (init_t) handle.GetSymbol(PLUG_INIT); - if (!init) + if (!init) { cerr << "[PLUGLOADER] Error: Cannot load symbol : " << PLUG_INIT << endl; handle.Unload(); return ; } destroy = (destroy_t) handle.GetSymbol(PLUG_DESTROY); - if (!destroy) + if (!destroy) { cerr << "[PLUGLOADER] Error: Cannot load symbol : " << PLUG_DESTROY << endl; handle.Unload(); return ; - } + } create = (create_t) handle.GetSymbol(PLUG_CREATE); - if (!create) + if (!create) { cerr << "[PLUGLOADER] Error: Cannot load symbol : " << PLUG_CREATE << endl; handle.Unload(); return ; - } + } // get unique info from plugin (id, name, version, size, ..) InitInfo = init(); @@ -85,7 +85,7 @@ // check version of API if (InitInfo.Version != WIRED_CURRENT_VERSION_API) { - cerr << "[PLUGLOADER] Error: Cannot load plugin " << filename.mb_str() + cerr << "[PLUGLOADER] Error: Cannot load plugin " << filename.mb_str() << ", it has deprecated version of API " << endl; handle.Unload(); return ; @@ -112,7 +112,7 @@ if (ExternalPlug) ExternalPlug->SetInfo(&info); - + return (Plugin*) ExternalPlug; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-08-28 15:39:10
|
Revision: 1561 http://wired.svn.sourceforge.net/wired/?rev=1561&view=rev Author: hdoomsday Date: 2009-08-28 15:39:01 +0000 (Fri, 28 Aug 2009) Log Message: ----------- [COMPILE] Fixed shared data path on win32 Modified Paths: -------------- trunk/wired/src/engine/Settings.cpp trunk/wired/src/gui/MainApp.cpp trunk/wired/win32/CodeBlocks/copydata.bat trunk/wired/win32/README.txt Modified: trunk/wired/src/engine/Settings.cpp =================================================================== --- trunk/wired/src/engine/Settings.cpp 2009-07-22 15:35:08 UTC (rev 1560) +++ trunk/wired/src/engine/Settings.cpp 2009-08-28 15:39:01 UTC (rev 1561) @@ -22,9 +22,14 @@ SetDefault(); - ConfDir = wxString(wxT(SYSCONF_DIR)) + wxT("/"); +#ifdef _WIN32 + // exemple : C:\\path\\wired_exe_install_dir\\conf + ConfDir = wxStandardPaths::Get().GetDataDir() + wxFileName::GetPathSeparator() + wxT("conf\\"); +#else + // exemple : /usr/etc/wired/ + ConfDir = wxString(wxT(SYSCONF_DIR)) + wxFileName::GetPathSeparator(); +#endif PlugConfFile = ConfDir + PLUG_CONF_FILE; - f.Assign(PlugConfFile); if (!f.FileExists()) { @@ -32,9 +37,12 @@ ConfDir = wxT("./"); PlugConfFile = ConfDir + PLUG_CONF_FILE; } + #ifdef _WIN32 - DataDir = wxStandardPaths::Get().GetDataDir() + wxFileName::GetPathSeparator() + wxT(DATA_DIR) + wxT("\\wired\\"); + // exemple : C:\\path\\wired_exe_install_dir\\data + DataDir = wxStandardPaths::Get().GetDataDir() + wxFileName::GetPathSeparator() + wxT(DATA_DIR) + wxFileName::GetPathSeparator(); #else + // exemple : /usr/share/wired/ DataDir = wxString(wxT(DATA_DIR)) + wxT("/wired/"); #endif f.Assign(DataDir); @@ -42,11 +50,11 @@ if (!f.DirExists()) { // if not found let hope it belongs the current directory - DataDir = wxT("./"); + DataDir = wxT(""); f.Assign(DataDir); } - f.AssignDir(f.GetHomeDir() + wxString(wxT("/")) + wxString(WIRED_DIRECTORY)); + f.AssignDir(f.GetHomeDir() + wxFileName::GetPathSeparator() + wxString(WIRED_DIRECTORY)); HomeDir = wxString(f.GetFullPath()); Modified: trunk/wired/src/gui/MainApp.cpp =================================================================== --- trunk/wired/src/gui/MainApp.cpp 2009-07-22 15:35:08 UTC (rev 1560) +++ trunk/wired/src/gui/MainApp.cpp 2009-08-28 15:39:01 UTC (rev 1561) @@ -156,7 +156,7 @@ { wxBitmap bitmap; - if (bitmap.LoadFile(wxString(DATA_DIR, *wxConvCurrent) + wxString(wxT("/wired/ihm/splash/splash.png")), wxBITMAP_TYPE_PNG)) + if (bitmap.LoadFile(WiredSettings->DataDir + wxString(wxT("/ihm/splash/splash.png")), wxBITMAP_TYPE_PNG)) { if ( ! splash ) { @@ -224,9 +224,6 @@ // this var is used in error dialog MainWin = (MainWindow *) NULL; - // splash screen - ShowSplash(); - // avoid two Wired's launch if (checkDoubleStart()) return false; @@ -235,6 +232,9 @@ saveCenter = new SaveCenter(); WiredSettings = new Settings(); // load settings + // splash screen + ShowSplash(); + // load wizard if (wxFileName::DirExists(SessionDir)) WiredStartSession(SessionDir); Modified: trunk/wired/win32/CodeBlocks/copydata.bat =================================================================== --- trunk/wired/win32/CodeBlocks/copydata.bat 2009-07-22 15:35:08 UTC (rev 1560) +++ trunk/wired/win32/CodeBlocks/copydata.bat 2009-08-28 15:39:01 UTC (rev 1561) @@ -1,6 +1,6 @@ -mkdir .\bin\data\wired +mkdir .\bin\data\ mkdir .\bin\conf echo Makefile.am > templist.txt -xcopy ..\..\src\data\* .\bin\data\wired /S /Y /EXCLUDE:templist.txt +xcopy ..\..\src\data\* .\bin\data\ /S /Y /EXCLUDE:templist.txt del templist.txt copy /Y ..\*.conf .\bin\conf Modified: trunk/wired/win32/README.txt =================================================================== --- trunk/wired/win32/README.txt 2009-07-22 15:35:08 UTC (rev 1560) +++ trunk/wired/win32/README.txt 2009-08-28 15:39:01 UTC (rev 1561) @@ -21,10 +21,7 @@ Using Code::Blocks IDE: Open the file "win32/CodeBlocks/Wired.workspace" and run "Build > Build workspace" to compile everything. More details at http://www.codeblocks.org/ -Run "copydata.bat" to copy src/data content to bin directory. -For both cases the required DLLs need to be on PATH or at the same directory where wired.exe is. - -------------------------------------------------------------------------------- How to generate a installer @@ -34,3 +31,10 @@ Open the file "win32/installer.iss" using Inno Setup and press Ctrl+F9. Take a look at "win32/Output" and enjoy! + +-------------------------------------------------------------------------------- + +How to run a fresh build + +Run "copydata.bat" to copy data (logo, icon, ...) content to bin directory. +The required DLLs need to be on PATH or at the same directory where wired.exe is. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj-...@us...> - 2009-07-22 15:35:11
|
Revision: 1560 http://wired.svn.sourceforge.net/wired/?rev=1560&view=rev Author: pj-leger Date: 2009-07-22 15:35:08 +0000 (Wed, 22 Jul 2009) Log Message: ----------- moved version to 0.7.0 Modified Paths: -------------- tags/release-0.7.0/configure.ac Modified: tags/release-0.7.0/configure.ac =================================================================== --- tags/release-0.7.0/configure.ac 2009-07-22 09:50:45 UTC (rev 1559) +++ tags/release-0.7.0/configure.ac 2009-07-22 15:35:08 UTC (rev 1560) @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([Wired], [0.6.1], [wi...@bl...]) +AC_INIT([Wired], [0.7.0], [wi...@bl...]) # Auxiliary files. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-07-22 09:50:54
|
Revision: 1559 http://wired.svn.sourceforge.net/wired/?rev=1559&view=rev Author: hdoomsday Date: 2009-07-22 09:50:45 +0000 (Wed, 22 Jul 2009) Log Message: ----------- [COMPIL] fixed error with MINGW GCC Modified Paths: -------------- trunk/wired/src/midi/MidiController.cpp Modified: trunk/wired/src/midi/MidiController.cpp =================================================================== --- trunk/wired/src/midi/MidiController.cpp 2009-05-26 18:45:11 UTC (rev 1558) +++ trunk/wired/src/midi/MidiController.cpp 2009-07-22 09:50:45 UTC (rev 1559) @@ -13,7 +13,7 @@ #define MIDIWIDTH 206 MidiController::MidiController(wxWindow *parent) : - wxDialog(parent, -1, (const wxString&)_("Assign Midi Controller")) + wxDialog(parent, (wxWindowID)-1, (const wxString&)_("Assign Midi Controller")) { Centre(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-05-26 18:45:58
|
Revision: 1558 http://wired.svn.sourceforge.net/wired/?rev=1558&view=rev Author: hdoomsday Date: 2009-05-26 18:45:11 +0000 (Tue, 26 May 2009) Log Message: ----------- [COMPILE] Updated CodeBlocks and Win32 issues Modified Paths: -------------- trunk/wired/src/gui/MainApp.cpp trunk/wired/src/midi/MidiController.cpp trunk/wired/win32/CodeBlocks/wired.cbp Property Changed: ---------------- trunk/wired/win32/CodeBlocks/ Modified: trunk/wired/src/gui/MainApp.cpp =================================================================== --- trunk/wired/src/gui/MainApp.cpp 2009-05-25 20:31:57 UTC (rev 1557) +++ trunk/wired/src/gui/MainApp.cpp 2009-05-26 18:45:11 UTC (rev 1558) @@ -2,6 +2,7 @@ // Under the GNU General Public License Version 2, June 1991 #include <new> +#include <iostream> #include <wx/bitmap.h> #include <wx/event.h> @@ -211,7 +212,7 @@ return true; } -// start point of Wired +// start point of Wired bool MainApp::OnInit() { cout << "[MAINAPP] Wired initialization..." << endl; Modified: trunk/wired/src/midi/MidiController.cpp =================================================================== --- trunk/wired/src/midi/MidiController.cpp 2009-05-25 20:31:57 UTC (rev 1557) +++ trunk/wired/src/midi/MidiController.cpp 2009-05-26 18:45:11 UTC (rev 1558) @@ -13,7 +13,7 @@ #define MIDIWIDTH 206 MidiController::MidiController(wxWindow *parent) : - wxDialog(parent, -1, _("Assign Midi Controller")) + wxDialog(parent, -1, (const wxString&)_("Assign Midi Controller")) { Centre(); Property changes on: trunk/wired/win32/CodeBlocks ___________________________________________________________________ Added: svn:ignore + obj bin *.depend *.layout Modified: trunk/wired/win32/CodeBlocks/wired.cbp =================================================================== --- trunk/wired/win32/CodeBlocks/wired.cbp 2009-05-25 20:31:57 UTC (rev 1557) +++ trunk/wired/win32/CodeBlocks/wired.cbp 2009-05-26 18:45:11 UTC (rev 1558) @@ -7,7 +7,7 @@ <Option compiler="gcc" /> <Build> <Target title="Debug"> - <Option output=".\bin\wired.exe" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\wired" prefix_auto="1" extension_auto="1" /> <Option working_dir=".\bin\" /> <Option object_output="obj\Debug\" /> <Option type="1" /> @@ -26,7 +26,7 @@ </Compiler> </Target> <Target title="Release"> - <Option output=".\bin\wired.exe" prefix_auto="1" extension_auto="1" /> + <Option output=".\bin\wired" prefix_auto="1" extension_auto="1" /> <Option working_dir=".\bin\" /> <Option object_output="obj\Release\" /> <Option type="1" /> @@ -143,6 +143,7 @@ <Unit filename="..\..\src\engine\Settings.h" /> <Unit filename="..\..\src\engine\version.h" /> <Unit filename="..\..\src\error.hh" /> + <Unit filename="..\..\src\fileloader\FileConversion.cpp" /> <Unit filename="..\..\src\fileloader\FileStat.cpp" /> <Unit filename="..\..\src\fileloader\FileStat.h" /> <Unit filename="..\..\src\fileloader\TreeItemData.cpp" /> @@ -160,7 +161,6 @@ <Unit filename="..\..\src\gui\Colour.h" /> <Unit filename="..\..\src\gui\Cursor.cpp" /> <Unit filename="..\..\src\gui\Cursor.h" /> - <Unit filename="..\..\src\gui\FileConversion.cpp" /> <Unit filename="..\..\src\gui\FileConversion.h" /> <Unit filename="..\..\src\gui\FloatingFrame.cpp" /> <Unit filename="..\..\src\gui\FloatingFrame.h" /> @@ -193,6 +193,7 @@ <Unit filename="..\..\src\gui\PluginEffect.h" /> <Unit filename="..\..\src\gui\Rack.cpp" /> <Unit filename="..\..\src\gui\Rack.h" /> + <Unit filename="..\..\src\gui\RackTrack.cpp" /> <Unit filename="..\..\src\gui\Ruler.cpp" /> <Unit filename="..\..\src\gui\Ruler.h" /> <Unit filename="..\..\src\gui\SelectionZone.cpp" /> @@ -280,6 +281,7 @@ </Unit> <Extensions> <code_completion /> + <debugger /> </Extensions> </Project> </CodeBlocks_project_file> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kik...@us...> - 2009-05-25 20:32:25
|
Revision: 1557 http://wired.svn.sourceforge.net/wired/?rev=1557&view=rev Author: kiketloule Date: 2009-05-25 20:31:57 +0000 (Mon, 25 May 2009) Log Message: ----------- [UNDO] Added CreateEffectAction Modified Paths: -------------- trunk/wired/src/gui/MainWindow.cpp trunk/wired/src/gui/PluginEffect.cpp trunk/wired/src/gui/PluginEffect.h trunk/wired/src/undo/cActionManager.cpp trunk/wired/src/undo/cActionManager.h trunk/wired/src/undo/cImportMidiAction.cpp trunk/wired/src/undo/cImportMidiAction.h Modified: trunk/wired/src/gui/MainWindow.cpp =================================================================== --- trunk/wired/src/gui/MainWindow.cpp 2009-05-20 06:51:26 UTC (rev 1556) +++ trunk/wired/src/gui/MainWindow.cpp 2009-05-25 20:31:57 UTC (rev 1557) @@ -21,6 +21,7 @@ #include "OptionPanel.h" #include "Rack.h" #include "RackTrack.h" +#include "PluginEffect.h" #include "SeqTrack.h" #include "MixerGui.h" #include "DownButton.h" @@ -1157,11 +1158,17 @@ LOG; if (LoadedExternalPlugins) { + wxString label = _("creating "); cout << "[MAINWIN] Creating rack for plugin id :" << event.GetId() << endl; PluginLoader *NewPlugin = new PluginLoader(LoadedExternalPlugins, event.GetId(), StartInfo); + label += NewPlugin->InitInfo.Name; - LoadedPluginsList.push_back(NewPlugin); - cActionManager::Global().AddEffectAction(&StartInfo, NewPlugin, true); + if(NewPlugin) + { + LoadedPluginsList.push_back(NewPlugin); + CreateEffectAction *action = new CreateEffectAction(label, &StartInfo, NewPlugin); + UndoRedo->Submit(action); + } } } @@ -1204,9 +1211,12 @@ } if (p) { + wxString label = _("creating "); cout << "[MAINWIN] Creating rack for plugin: " << p->InitInfo.Name.mb_str() << endl; - cActionManager::Global().AddEffectAction(&StartInfo, p, true); - CreateUndoRedoMenus(EditMenu); + + label += p->InitInfo.Name; + CreateEffectAction* action = new CreateEffectAction(label, &StartInfo, p); + UndoRedo->Submit(action); } } Modified: trunk/wired/src/gui/PluginEffect.cpp =================================================================== --- trunk/wired/src/gui/PluginEffect.cpp 2009-05-20 06:51:26 UTC (rev 1556) +++ trunk/wired/src/gui/PluginEffect.cpp 2009-05-25 20:31:57 UTC (rev 1557) @@ -8,10 +8,13 @@ #include <math.h> #include "PluginEffect.h" +#include "Rack.h" + using namespace std; /* DO NOT MODIFY THIS FILE FOR MAKING A PLUGIN. JUST DERIVE FROM THAT CLASS */ + PluginEffect::PluginEffect() { @@ -79,3 +82,30 @@ } +/******************** class cCreateEffectAction ********************/ + +CreateEffectAction::CreateEffectAction (wxString& label, PlugStartInfo* startInfo, PluginLoader* plugLoader) + : wxCommand(true, label) +{ + mPluginLoader = plugLoader; + mStartInfo = startInfo; +} + +bool CreateEffectAction::Do () +{ + bool ret = false; + + if (mPluginLoader) + { + _created = RackPanel->AddNewRack(*mStartInfo, mPluginLoader); + ret = true; + } + + return ret; +} + +bool CreateEffectAction::Undo () +{ + RackPanel->DeleteRack(_created, true); + return true; +} Modified: trunk/wired/src/gui/PluginEffect.h =================================================================== --- trunk/wired/src/gui/PluginEffect.h 2009-05-20 06:51:26 UTC (rev 1556) +++ trunk/wired/src/gui/PluginEffect.h 2009-05-25 20:31:57 UTC (rev 1557) @@ -7,8 +7,33 @@ #include "WaveFile.h" #include <wx/wx.h> #include <wx/textdlg.h> +#include <wx/cmdproc.h> +class PluginLoader; +class Plugin; +typedef struct s_PlugStartInfo PlugStartInfo; +/******************** class CreateEffectAction ********************/ + +class CreateEffectAction : public wxCommand +{ +private: + PluginLoader *mPluginLoader; // Contexte + PlugStartInfo *mStartInfo; // Contexte + + Plugin* _created; + +public: + CreateEffectAction (wxString& label, PlugStartInfo* startInfo, PluginLoader * plugin); + ~CreateEffectAction () {}; + + bool Do (); + bool Undo (); +}; + + +/******************** class PluginEffect ********************/ + class PluginEffect { public: Modified: trunk/wired/src/undo/cActionManager.cpp =================================================================== --- trunk/wired/src/undo/cActionManager.cpp 2009-05-20 06:51:26 UTC (rev 1556) +++ trunk/wired/src/undo/cActionManager.cpp 2009-05-25 20:31:57 UTC (rev 1557) @@ -30,12 +30,6 @@ return *spSingleton; } -void cActionManager::AddEffectAction(PlugStartInfo* startInfo, PluginLoader* plugLoader, bool shouldAdd) -{ - cCreateEffectAction* action = new cCreateEffectAction(startInfo, plugLoader, shouldAdd); - action->Do(); -} - void cActionManager::AddImportWaveAction(const wxString& path, trackType kind, bool selectFromIndex) { cImportWaveAction* action = new cImportWaveAction(path, kind, selectFromIndex); Modified: trunk/wired/src/undo/cActionManager.h =================================================================== --- trunk/wired/src/undo/cActionManager.h 2009-05-20 06:51:26 UTC (rev 1556) +++ trunk/wired/src/undo/cActionManager.h 2009-05-25 20:31:57 UTC (rev 1557) @@ -75,9 +75,6 @@ bool Redo(int id); // Refait la derniere action annulee bool Undo(int id); // Annule la derniere action effectuee void Dump(); // Debug - Dump les donnees membres - void AddEffectAction(PlugStartInfo* startInfo, // Adds a cEffectAction in cActionManager - PluginLoader* plugLoader, - bool shouldAdd); void AddChangeParamsEffectAction(Plugin* plugin, bool shouldSave); // Adds a cChangeParamsEffectAction in cActionManager void AddImportWaveAction(const wxString& path, trackType kind, bool selectFromIndex); // Adds a cImportWaveAction in cActionManager Modified: trunk/wired/src/undo/cImportMidiAction.cpp =================================================================== --- trunk/wired/src/undo/cImportMidiAction.cpp 2009-05-20 06:51:26 UTC (rev 1556) +++ trunk/wired/src/undo/cImportMidiAction.cpp 2009-05-25 20:31:57 UTC (rev 1557) @@ -296,90 +296,3 @@ } return *this; } - -/******************** class cCreateEffectAction ********************/ - -cCreateEffectAction::cCreateEffectAction (PlugStartInfo* startInfo, PluginLoader* plugLoader, - bool shouldAdd) -{ - mPluginLoader = plugLoader; - mStartInfo = startInfo; - mShouldAdd = shouldAdd; - mRackIndex = INVALID_VALUE; -} - -void cCreateEffectAction::Do () -{ - if (mShouldAdd == true) - AddRackEffect(); - else - RemoveRackEffect(); -} - -void cCreateEffectAction::Redo () -{ - Do(); -} - -void cCreateEffectAction::Undo () -{ - if (mShouldAdd == true) - RemoveRackEffect(); - else - AddRackEffect(); -} - -void cCreateEffectAction::AddRackEffect () -{ - if (mPluginLoader) - { - if (mRackIndex < 0) - mRackIndex = RackPanel->RackTracks.size(); - - if (RackPanel->AddNewRack(*mStartInfo, mPluginLoader)) - NotifyActionManager(); - } -} - -const wxString cCreateEffectAction::getHistoryLabel() -{ - wxString result; - - result = HISTORY_LABEL_CREATE_EFFECT_ACTION; - result += wxT(" "); - result += mPluginLoader->InitInfo.Name; - return result; -} - -void cCreateEffectAction::RemoveRackEffect () -{ - if (mRackIndex < 0) - RackPanel->RemoveSelectedRackTrack(); - else - RackPanel->RemoveRackTrack(mRackIndex); - // TODO: Should be identified by StartInfo and PluginLoader - // TODO bis : must delete this undo engine... - NotifyActionManager(); -} - -void cCreateEffectAction::Dump() -{ - std::cout << " Dumping cCreateEffectAction : " << this << std::endl; - std::cout << " PluginLoader *mPluginLoader : " << mPluginLoader << std::endl; - std::cout << " PlugStartInfo *mStartInfo : " << mStartInfo << std::endl; - std::cout << " bool mShouldAdd : " << mShouldAdd << std::endl; - cAction::Dump(); - std::cout << " End Dumping cCreateEffectAction" << std::endl; -} - -cCreateEffectAction cCreateEffectAction::operator=(const cCreateEffectAction& right) -{ - if (this != &right) - { - mPluginLoader = right.mPluginLoader; - mStartInfo = right.mStartInfo; - mShouldAdd = right.mShouldAdd; - mRackIndex = right.mRackIndex; - } - return *this; -} Modified: trunk/wired/src/undo/cImportMidiAction.h =================================================================== --- trunk/wired/src/undo/cImportMidiAction.h 2009-05-20 06:51:26 UTC (rev 1556) +++ trunk/wired/src/undo/cImportMidiAction.h 2009-05-25 20:31:57 UTC (rev 1557) @@ -129,36 +129,5 @@ cChangeParamsEffectAction operator=(const cChangeParamsEffectAction& right); }; - -/******************** class cCreateEffectAction ********************/ - -class cCreateEffectAction : public cAction -{ -private: - PluginLoader *mPluginLoader; // Contexte - PlugStartInfo *mStartInfo; // Contexte - bool mShouldAdd; // True if should add in Do() - int mRackIndex; // Index du rack dans le RackPanel - Abandonne car remove casse les index dsna RackTracks - //RackTrack *mRackTrack; // Effect instance - -public: - cCreateEffectAction (PlugStartInfo* startInfo, PluginLoader * plugin, bool shouldAdd); - cCreateEffectAction (const cCreateEffectAction& copy){*this = copy;}; - ~cCreateEffectAction () {}; - virtual void Do (); // Does action - virtual void Redo (); // Does redo action - virtual void Undo (); // Does undo action - virtual void Accept // Don't known - (cActionVisitor& visitor) { visitor.Visit (*this); }; - virtual const wxString getHistoryLabel(); // Returns History label wstring - void AddRackEffect (); // Adds a rack effect - void RemoveRackEffect (); // Removes a rack effect - void Dump(); // Debug - Draws member variables - - cCreateEffectAction operator=(const cCreateEffectAction& right); -}; - - - #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-05-20 06:51:33
|
Revision: 1556 http://wired.svn.sourceforge.net/wired/?rev=1556&view=rev Author: hdoomsday Date: 2009-05-20 06:51:26 +0000 (Wed, 20 May 2009) Log Message: ----------- [COMPIL] Added --disable-video option to ./configure Modified Paths: -------------- trunk/wired/configure.ac trunk/wired/src/Makefile.am trunk/wired/src/gui/MainWindow.cpp Modified: trunk/wired/configure.ac =================================================================== --- trunk/wired/configure.ac 2009-05-15 20:01:19 UTC (rev 1555) +++ trunk/wired/configure.ac 2009-05-20 06:51:26 UTC (rev 1556) @@ -84,6 +84,14 @@ [enable_codecs="yes"]) AM_CONDITIONAL(CODECS, test x$enable_codecs = xyes) +# can enable or disable Wired video +AC_ARG_ENABLE(video, + [ --enable-video Enable or disable Wired video (default enabled)], + [enable_video="$enableval"], + [enable_video="yes"]) +AM_CONDITIONAL(VIDEO, test x$enable_video = xyes) + +# can enable or disable optimization AC_ARG_ENABLE(optimize, [ --enable-optimize Enable or disable compilation optimizations (default enabled)], [enable_optimize="$enableval"], @@ -120,6 +128,11 @@ AC_CHECK_LIB([vorbis], [vorbis_info_init], [VORBIS='yes'], AC_MSG_ERROR([Couldn't find libvorbis])) fi +# libs used in wired video +if test x"$enable_video" = xyes; then + AC_DEFINE_UNQUOTED(VIDEO, "1", [define if video enabled]) +fi + #Checking for wxWidgets AM_OPTIONS_WXCONFIG reqwx=2.6.0 @@ -395,10 +408,15 @@ Wired conf directory : .............. ${SYSCONF_DIR} ]) -if test "$enable_codecs" = yes; then +AC_MSG_RESULT([ Wired features : + Wired codecs : .............. $enable_codecs + Wired plugins : .............. $enable_plugins + Wired video : .............. $enable_video +]) + AC_MSG_RESULT([ Wired codecs : MPEG, FLAC, Vorbis WARNING : Codecs support are in a TESTING stage. Wired could be UNSTABLE. + Wired video : me too. ]) -fi Modified: trunk/wired/src/Makefile.am =================================================================== --- trunk/wired/src/Makefile.am 2009-05-15 20:01:19 UTC (rev 1555) +++ trunk/wired/src/Makefile.am 2009-05-20 06:51:26 UTC (rev 1556) @@ -17,11 +17,13 @@ xml \ samplerate \ codec \ - wiredvideo \ dssi +if VIDEO +SUBDIRS+=\ + wiredvideo +endif - DEPS_LIBS = libs/WiredWidgets/src/.libs/libWiredWidgets.so \ libs/WiredAkai/src/.libs/libWiredAkai.so @@ -69,8 +71,11 @@ xml/libwiredxml.a \ samplerate/libwiredsamplerate.a \ codec/libwiredCodec.a \ - wiredvideo/libwiredvideo.a \ dssi/libwireddssi.a +if VIDEO +wired_LDADD +=\ + wiredvideo/libwiredvideo.a +endif if PORTMIDI wired_LDADD +=\ Modified: trunk/wired/src/gui/MainWindow.cpp =================================================================== --- trunk/wired/src/gui/MainWindow.cpp 2009-05-15 20:01:19 UTC (rev 1555) +++ trunk/wired/src/gui/MainWindow.cpp 2009-05-20 06:51:26 UTC (rev 1556) @@ -62,7 +62,9 @@ Rack *RackPanel = NULL; SequencerGui *SeqPanel = NULL; Sequencer *Seq = NULL; +#ifdef VIDEO WiredVideo *WiredVideoObject = NULL; +#endif AudioEngine *Audio = NULL; Mixer *Mix = NULL; AudioCenter WaveCenter; @@ -131,7 +133,9 @@ MenuBar = new wxMenuBar; FileMenu = new wxMenu; EditMenu = new wxMenu; +#ifdef VIDEO VideoMenu = new wxMenu; +#endif UndoMenu = new wxMenu; RedoMenu = new wxMenu; SequencerMenu = new wxMenu; @@ -218,7 +222,9 @@ MenuBar->Append(CreateInstrMenu, _("&Instruments")); MenuBar->Append(CreateEffectMenu, _("Effec&ts")); MenuBar->Append(MediaLibraryMenu, _("&MediaLibrary")); +#ifdef VIDEO MenuBar->Append(VideoMenu, _("&Video")); +#endif MenuBar->Append(WindowMenu, _("&Window")); MenuBar->Append(HelpMenu, _("&Help")); @@ -588,6 +594,7 @@ void MainWindow::InitVideoMenuItems() { +#ifdef VIDEO LOG; VideoMenu->Append(MainWin_VideoBeta, _("This feature is currently in alpha stage")); @@ -599,6 +606,7 @@ WiredVideoObject = new WiredVideo(); VideoMenu->Enable(MainWin_OpenVideo, true); VideoMenu->Enable(MainWin_CloseVideo, false); +#endif } void MainWindow::OnClose(wxCloseEvent &event) @@ -1594,24 +1602,29 @@ void MainWindow::OnOpenVideo(wxCommandEvent &event) { +#ifdef VIDEO LOG; if ( WiredVideoObject->OpenFile() == true ) { VideoMenu->Enable(MainWin_OpenVideo, false); VideoMenu->Enable(MainWin_CloseVideo, true); } +#endif } void MainWindow::OnCloseVideo(wxCommandEvent &event) { +#ifdef VIDEO LOG; WiredVideoObject->CloseFile(); VideoMenu->Enable(MainWin_OpenVideo, true); VideoMenu->Enable(MainWin_CloseVideo, false); +#endif } void MainWindow::OnSeekVideo(wxCommandEvent &event) { +#ifdef VIDEO LOG; static bool started = false; @@ -1619,6 +1632,7 @@ WiredVideoObject->Play(); else WiredVideoObject->Stop(); +#endif } void MainWindow::SetSelectedSolo(wxCommandEvent &event) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-05-15 20:01:36
|
Revision: 1555 http://wired.svn.sourceforge.net/wired/?rev=1555&view=rev Author: hdoomsday Date: 2009-05-15 20:01:19 +0000 (Fri, 15 May 2009) Log Message: ----------- [GUI] Improved SettingWindow with wxsizer Modified Paths: -------------- trunk/wired/src/gui/SettingWindow.cpp Modified: trunk/wired/src/gui/SettingWindow.cpp =================================================================== --- trunk/wired/src/gui/SettingWindow.cpp 2009-05-10 18:28:44 UTC (rev 1554) +++ trunk/wired/src/gui/SettingWindow.cpp 2009-05-15 20:01:19 UTC (rev 1555) @@ -25,24 +25,8 @@ #define CATEGORY_ID 25001 +#define WIN_SIZE wxSize(650, 520) -#define WIN_WIDTH 650 -#define WIN_HEIGHT 520 -#define WIN_SIZE wxSize(WIN_WIDTH, WIN_HEIGHT) - -#define WIN_MARGIN 12 - -#define BTN_WIDTH 88 -#define BTN_HEIGHT 32 -#define BTN_SIZE wxSize(BTN_WIDTH, BTN_HEIGHT) -#define BTN_POS_Y (WIN_HEIGHT - WIN_MARGIN - BTN_HEIGHT) -#define BTN_CANCEL_POS wxPoint(WIN_WIDTH - 3 * (BTN_WIDTH + 6) + 6 - WIN_MARGIN, BTN_POS_Y) -#define BTN_OK_POS wxPoint(WIN_WIDTH - BTN_WIDTH - WIN_MARGIN, BTN_POS_Y) -#define BTN_APPLY_POS wxPoint(WIN_WIDTH - 2 * BTN_WIDTH - 6 - WIN_MARGIN, BTN_POS_Y) - -#define PAN_SIZE wxSize(584, 436) -#define PAN_POS wxPoint(222, WIN_MARGIN) - #define MENUICON_SIZE (20) #ifndef RESIZE_ICON # define RESIZE_ICON(ico, w, h) (wxBitmap(ico).ConvertToImage().Rescale(w, h)) @@ -51,21 +35,25 @@ using namespace std; SettingWindow::SettingWindow() - : wxDialog(0x0, -1, _("Wired Settings"), wxDefaultPosition, WIN_SIZE) + : wxDialog(NULL, -1, _("Wired Settings"), wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER) { wxTreeItemId root; wxTreeItemId AudioItem; + wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* horiSizer = new wxBoxSizer(wxHORIZONTAL); + // set a minimal size to the window + mainSizer->SetMinSize(WIN_SIZE); + MidiLoaded = false; AudioLoaded = false; - Center(); - SettingsTree = new wxTreeCtrl(this, CATEGORY_ID, wxPoint(WIN_MARGIN, WIN_MARGIN), - wxSize(206, 400), wxSUNKEN_BORDER | wxTR_NO_LINES | + SettingsTree = new wxTreeCtrl(this, CATEGORY_ID, wxDefaultPosition, wxDefaultSize, + wxSUNKEN_BORDER | wxTR_NO_LINES | wxTR_HAS_BUTTONS | wxTR_SINGLE | wxTR_HIDE_ROOT | - wxTR_FULL_ROW_HIGHLIGHT); + wxTR_FULL_ROW_HIGHLIGHT | wxTR_EXTENDED); - wxImageList *imagelist = new wxImageList(MENUICON_SIZE, MENUICON_SIZE, TRUE); + wxImageList *imagelist = new wxImageList(MENUICON_SIZE, MENUICON_SIZE, true); imagelist->Add(RESIZE_ICON(wxIcon(general_xpm), MENUICON_SIZE, MENUICON_SIZE)); imagelist->Add(RESIZE_ICON(wxIcon(audio_xpm), MENUICON_SIZE, MENUICON_SIZE)); @@ -77,9 +65,9 @@ // flags assigned to all sizer in all right panel BoxFlags.Left(); BoxFlags.Expand(); - BoxFlags.Border(wxALL, 8); + BoxFlags.Border(); - //SettingsTree->SetIndent(20); + // initialize all view/panel GeneralPanelView(); AudioPanelView(); AudioInputPanelView(); @@ -97,6 +85,7 @@ // start with audio item already expanded SettingsTree->Expand(AudioItem); + // show only the current "general" panel AudioPanel->Show(false); MidiPanel->Show(false); AudioInputPanel->Show(false); @@ -104,10 +93,30 @@ GeneralPanel->Show(true); CurrentPanel = GeneralPanel; - OkBtn = new wxButton(this, wxID_OK, _("OK"), BTN_OK_POS, BTN_SIZE); - ApplyBtn = new wxButton(this, wxID_APPLY, _("Apply"), BTN_APPLY_POS, BTN_SIZE); - CancelBtn = new wxButton(this, wxID_CANCEL, _("Cancel"), BTN_CANCEL_POS, BTN_SIZE); + // add colomns of the first "line" to the sizer + horiSizer->Add(SettingsTree, wxSizerFlags().Proportion(40).Expand().Right().Border()); + horiSizer->Add(CurrentPanel, wxSizerFlags().Proportion(100).Expand().Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL).Border()); + // create the standardized way to create dialog buttons + wxStdDialogButtonSizer* buttonSizer = new wxStdDialogButtonSizer(); + + buttonSizer->AddButton(new wxButton(this, wxID_OK, _("OK"))); + buttonSizer->AddButton(new wxButton(this, wxID_APPLY, _("Apply"))); + buttonSizer->AddButton(new wxButton(this, wxID_CANCEL, _("Cancel"))); + // re-order buttons accordling to the theme and/or system + buttonSizer->Realize(); + + // add first and second line to the main sizer + mainSizer->Add(horiSizer, wxSizerFlags().Proportion(100).Expand().Border()); + mainSizer->Add(buttonSizer, wxSizerFlags().Align(wxALIGN_RIGHT | wxALIGN_BOTTOM).Border()); + + // resize items and window + SetSizer(mainSizer); + mainSizer->SetSizeHints(this); + + // center the window on the screen + Center(); + Load(); } @@ -123,18 +132,34 @@ void SettingWindow::GeneralPanelView() { - GeneralPanel = new wxPanel(this, -1, PAN_POS, PAN_SIZE, wxSUNKEN_BORDER); - QuickWaveBox = new wxCheckBox(GeneralPanel, -1, _("Quickly render waveforms"), wxPoint(8, 8)); - dBWaveBox = new wxCheckBox(GeneralPanel, -1, _("Render waveforms in dB mode"), wxPoint(8, 28)); - undoRedoMaxDepthTextCtrl = new wxTextCtrl(GeneralPanel, -1, wxT(""), wxPoint(218, 50), wxSize(45, 25)); - undoRedoMaxDepthStaticText = new wxStaticText(GeneralPanel, -1, _("Undo redo maximum depth"), wxPoint(10, 50)); + wxBoxSizer* panelSizer = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* undoSizer = new wxBoxSizer(wxHORIZONTAL); + + GeneralPanel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER); + + QuickWaveBox = new wxCheckBox(GeneralPanel, -1, _("Quickly render waveforms")); + dBWaveBox = new wxCheckBox(GeneralPanel, -1, _("Render waveforms in dB mode")); + + undoRedoMaxDepthStaticText = new wxStaticText(GeneralPanel, -1, _("Undo redo maximum depth :")); + undoRedoMaxDepthTextCtrl = new wxTextCtrl(GeneralPanel, -1); + + undoSizer->Add(undoRedoMaxDepthStaticText, BoxFlags); + undoSizer->Add(undoRedoMaxDepthTextCtrl, BoxFlags); + + panelSizer->Add(QuickWaveBox, BoxFlags); + panelSizer->Add(dBWaveBox, BoxFlags); + panelSizer->AddSpacer( 5 ); + panelSizer->Add(undoSizer, BoxFlags); + + GeneralPanel->SetSizer(panelSizer); + panelSizer->SetSizeHints(this); } // Creates the panel for global audio settings void SettingWindow::AudioPanelView() { - AudioPanel = new wxPanel(this, -1, PAN_POS, PAN_SIZE, wxSUNKEN_BORDER); + AudioPanel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER); } // @@ -144,7 +169,7 @@ void SettingWindow::AudioInputPanelView() { // right panel - AudioInputPanel = new wxPanel(this, -1, PAN_POS, PAN_SIZE, wxSUNKEN_BORDER); + AudioInputPanel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER); // list of audio system InputSystemChoice = new wxChoice(AudioInputPanel, Setting_InputSystem); @@ -172,7 +197,7 @@ InputBox->Add(InputChannelList, BoxFlags); AudioInputPanel->SetSizer(InputBox); - InputBox->SetSizeHints(AudioInputPanel); + InputBox->SetSizeHints(this); } // @@ -182,10 +207,10 @@ void SettingWindow::AudioOutputPanelView() { // right panel - AudioOutputPanel = new wxPanel(this, -1, PAN_POS, PAN_SIZE, wxSUNKEN_BORDER); + AudioOutputPanel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER); //samplerate and bitrate choice - BitRateText = new wxStaticText(AudioOutputPanel, -1, _("Sample format:"), wxPoint(8, 10)); + BitRateText = new wxStaticText(AudioOutputPanel, -1, _("Sample format:")); BitsChoice = new wxChoice(AudioOutputPanel, Setting_Bits); SampleRateText = new wxStaticText(AudioOutputPanel, -1, _("Sample rate:")); RateChoice = new wxChoice(AudioOutputPanel, Setting_Rate); @@ -208,7 +233,7 @@ Audio->GetDefaultOutputDevice()); // list of channels - OutputChannelList = new wxCheckListBox(AudioOutputPanel, Setting_OutputChan, wxPoint(0, 0), wxSize(45, 60)); + OutputChannelList = new wxCheckListBox(AudioOutputPanel, Setting_OutputChan); RefreshChannels(OutputChannelList, OutputSystemChoice->GetSelection(), OutputDeviceChoice->GetSelection(), false); @@ -238,18 +263,27 @@ OutputBox->Add(LatencySlider, BoxFlags); AudioOutputPanel->SetSizer(OutputBox); - OutputBox->SetSizeHints(AudioOutputPanel); + OutputBox->SetSizeHints(this); } // Creates the panel for midi settings void SettingWindow::MidiPanelView() { - MidiPanel = new wxPanel(this, -1, PAN_POS, PAN_SIZE, wxSUNKEN_BORDER); - new wxStaticText(MidiPanel, -1, _("Select MIDI In devices to use:"), - wxPoint(8, 8)); - MidiInList = new wxCheckListBox(MidiPanel, Setting_MidiIn, wxPoint(8, 30), wxSize(368, 200), 0); + MidiPanel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER); + + // fill midi devices + MidiInList = new wxCheckListBox(MidiPanel, Setting_MidiIn); PopulateMidiIn(MidiInList); + + // add panel sizer + wxBoxSizer* midiSizer = new wxBoxSizer(wxVERTICAL); + midiSizer->Add(new wxStaticText(MidiPanel, -1, _("Select MIDI In devices to use:")), + BoxFlags); + midiSizer->Add(MidiInList, BoxFlags); + + MidiPanel->SetSizer(midiSizer); + midiSizer->SetSizeHints(this); } @@ -283,14 +317,21 @@ void SettingWindow::OnSelPrefCategory(wxTreeEvent &e) { wxTreeItemId item = e.GetItem(); - wxPanel *tmp = (wxPanel *)SettingsTree->GetItemData(item); + wxPanel *newPanel = (wxPanel *)SettingsTree->GetItemData(item); //Hide old panel - if (tmp) + if (newPanel) { CurrentPanel->Show(false); - CurrentPanel = tmp; + + // resize dialog if necessary + if ( GetSizer()->Replace(CurrentPanel, newPanel, true) == false ) + { + cout << "[SETTINGWINDOW] Spank developers: panel not found" << endl; + } + + CurrentPanel = newPanel; } //Refresh panel content @@ -299,8 +340,8 @@ //Show new panel CurrentPanel->Show(true); - - + GetSizer()->Layout(); + GetSizer()->SetSizeHints(this); } // This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-05-10 18:28:48
|
Revision: 1554 http://wired.svn.sourceforge.net/wired/?rev=1554&view=rev Author: hdoomsday Date: 2009-05-10 18:28:44 +0000 (Sun, 10 May 2009) Log Message: ----------- [AUTOMATION] Display cleanly the MidiController window (using wx standard) Modified Paths: -------------- trunk/wired/src/midi/MidiController.cpp trunk/wired/src/midi/MidiController.h Modified: trunk/wired/src/midi/MidiController.cpp =================================================================== --- trunk/wired/src/midi/MidiController.cpp 2009-05-10 09:37:25 UTC (rev 1553) +++ trunk/wired/src/midi/MidiController.cpp 2009-05-10 18:28:44 UTC (rev 1554) @@ -6,52 +6,65 @@ MidiController *Controller = 0x0; BEGIN_EVENT_TABLE(MidiController, wxDialog) - EVT_BUTTON(ID_OK, MidiController::OnOkBtnClick) - EVT_BUTTON(ID_CANCEL, MidiController::OnCancelBtnClick) + EVT_BUTTON(wxID_OK, MidiController::OnOkBtnClick) + EVT_BUTTON(wxID_CANCEL, MidiController::OnCancelBtnClick) END_EVENT_TABLE() #define MIDIWIDTH 206 MidiController::MidiController(wxWindow *parent) : - wxDialog(parent, -1, _("Assign Midi Controller"), wxDefaultPosition, wxSize(206, MIDIWIDTH)) + wxDialog(parent, -1, _("Assign Midi Controller")) { Centre(); - sb = new wxStaticBox(this, -1, _("Assign to controller number :"), wxPoint(6, 4), wxSize(192, 160)); - OkBtn = new wxButton(this, ID_OK, _("OK"), wxPoint(20, 170)); - CancelBtn = new wxButton(this, ID_CANCEL, _("Cancel"), wxPoint(110, 170)); - ChannelText = new wxStaticText(this, -1, _("Channel:"), wxPoint(52, 26)); - ChannelCtrl = new wxSpinCtrl(this, -1, wxT("1"), wxPoint(52, 44)); + // sizer default flag: + wxSizerFlags flagsExpand; + flagsExpand.Expand().Border(wxALL, 3); - ControllerText = new wxStaticText(this, -1, _("Control:"), wxPoint(52, 70)); - ControllerCtrl = new wxSpinCtrl(this, -1, wxT("0"), wxPoint(52, 88)); + // create a grid with 2 columns and 5 pixels of space between cells + wxGridSizer* valuesSizer = new wxGridSizer(2, 3, 3); - ValueText = new wxStaticText(this, -1, _("Value:"), wxPoint(52, 114)); - ValueCtrl = new wxSpinCtrl(this, -1, wxT("0"), wxPoint(52, 130)); + ChannelCtrl = new wxSpinCtrl(this, -1, wxT("1")); + ControllerCtrl = new wxSpinCtrl(this, -1, wxT("0")); + ValueCtrl = new wxSpinCtrl(this, -1, wxT("0")); + valuesSizer->Add(new wxStaticText(this, -1, _("Channel:")), flagsExpand); + valuesSizer->Add(ChannelCtrl, flagsExpand); + + valuesSizer->Add(new wxStaticText(this, -1, _("Control:")), flagsExpand); + valuesSizer->Add(ControllerCtrl, flagsExpand); + + valuesSizer->Add(new wxStaticText(this, -1, _("Value:")), flagsExpand); + valuesSizer->Add(ValueCtrl, flagsExpand); + + // create the main static box + wxStaticBoxSizer* sbSizer = new wxStaticBoxSizer(new wxStaticBox(this, + -1, + _("Assign to controller number :")), + wxVERTICAL); + sbSizer->Add(valuesSizer, flagsExpand); + + // create the button + wxStdDialogButtonSizer* buttonSizer = this->CreateStdDialogButtonSizer(wxOK | wxCANCEL); + buttonSizer->Realize(); // This cmd is warned by wxWidgets debug mode. I think it's a wx bug! + + // .. and attach static, and buttons to the main sizer + wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); + mainSizer->Add(sbSizer, flagsExpand); + mainSizer->Add(buttonSizer, flagsExpand); + + // attach the sizer to the dialog + SetSizer( mainSizer ); + mainSizer->SetSizeHints( this ); + + // default type of midi event Type = 0; } MidiController::~MidiController() { - if(sb) - delete sb; - if (OkBtn) - delete OkBtn; - if (CancelBtn) - delete CancelBtn; - if (ChannelCtrl) - delete ChannelCtrl; - if(ControllerCtrl) - delete ControllerCtrl; - if (ValueCtrl) - delete ValueCtrl; - if (ChannelText) - delete ChannelText; - if (ControllerText) - delete ControllerText; - if (ValueText) - delete ValueText; + // we don't need to delete anything! + // main sizer do his job } void MidiController::ProcessMidi(int midi_msg[3]) Modified: trunk/wired/src/midi/MidiController.h =================================================================== --- trunk/wired/src/midi/MidiController.h 2009-05-10 09:37:25 UTC (rev 1553) +++ trunk/wired/src/midi/MidiController.h 2009-05-10 18:28:44 UTC (rev 1554) @@ -9,9 +9,6 @@ #include <wx/stattext.h> #include "midi.h" -#define ID_OK 100 -#define ID_CANCEL 101 - class MidiController : public wxDialog { public: @@ -30,16 +27,9 @@ bool Note; private: - wxStaticBox *sb; - wxButton *OkBtn; - wxButton *CancelBtn; - wxSpinCtrl *ChannelCtrl; wxSpinCtrl *ControllerCtrl; wxSpinCtrl *ValueCtrl; - wxStaticText *ChannelText; - wxStaticText *ControllerText; - wxStaticText *ValueText; DECLARE_EVENT_TABLE() }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-05-10 09:37:39
|
Revision: 1553 http://wired.svn.sourceforge.net/wired/?rev=1553&view=rev Author: hdoomsday Date: 2009-05-10 09:37:25 +0000 (Sun, 10 May 2009) Log Message: ----------- [SEQUENCER] improved sequencer latency Modified Paths: -------------- trunk/wired/src/gui/MainWindow.cpp trunk/wired/src/gui/MainWindow.h Modified: trunk/wired/src/gui/MainWindow.cpp =================================================================== --- trunk/wired/src/gui/MainWindow.cpp 2009-05-09 22:06:44 UTC (rev 1552) +++ trunk/wired/src/gui/MainWindow.cpp 2009-05-10 09:37:25 UTC (rev 1553) @@ -358,8 +358,9 @@ else wxGetApp().m_threads.Add(Seq); + // graphical timer (timeline moves, etc..) SeqTimer = new wxTimer(this, MainWin_SeqTimer); - SeqTimer->Start(3000); + SeqTimer->Start(40); WindowSize = MainWin->GetSize(); WindowPos = MainWin->GetPosition(); @@ -1817,36 +1818,43 @@ list<MidiPattern *>::iterator midiPatternIt; list<Plugin *>::iterator pluginIt; list<Track *>::iterator trackIt; - wxMutexLocker locker(SeqMutex); if (MixerPanel != NULL) + { MixerPanel->OnMasterChange(commandEvt); - if (Seq->Playing) - { - SeqPanel->OnSetPosition(cursorEvt); - - if (Seq->Recording) - { - for (patternIt = Seq->PatternsToResize.begin(); patternIt != Seq->PatternsToResize.end(); patternIt++) - { - commandEvt.SetEventObject((wxObject *)*patternIt); - SeqPanel->OnResizePattern(commandEvt); - } - Seq->PatternsToResize.clear(); - for (midiPatternIt = Seq->PatternsToRefresh.begin(); midiPatternIt != Seq->PatternsToRefresh.end(); midiPatternIt++) - { - commandEvt.SetEventObject((wxObject *)*midiPatternIt); - SeqPanel->OnDrawMidi(commandEvt); - } - Seq->PatternsToRefresh.clear(); - } } - UpdatePlugins.clear(); + // lock seqmutex + { + wxMutexLocker locker(SeqMutex); + if (Seq->Playing) + { - for (trackIt = Seq->TracksToRefresh.begin(); trackIt != Seq->TracksToRefresh.end(); trackIt++) - (*trackIt)->GetTrackOpt()->SetVuValue(); - Seq->TracksToRefresh.clear(); + SeqPanel->OnSetPosition(cursorEvt); + + if (Seq->Recording) + { + for (patternIt = Seq->PatternsToResize.begin(); patternIt != Seq->PatternsToResize.end(); patternIt++) + { + commandEvt.SetEventObject((wxObject *)*patternIt); + SeqPanel->OnResizePattern(commandEvt); + } + Seq->PatternsToResize.clear(); + for (midiPatternIt = Seq->PatternsToRefresh.begin(); midiPatternIt != Seq->PatternsToRefresh.end(); midiPatternIt++) + { + commandEvt.SetEventObject((wxObject *)*midiPatternIt); + SeqPanel->OnDrawMidi(commandEvt); + } + Seq->PatternsToRefresh.clear(); + } + } + + UpdatePlugins.clear(); + + for (trackIt = Seq->TracksToRefresh.begin(); trackIt != Seq->TracksToRefresh.end(); trackIt++) + (*trackIt)->GetTrackOpt()->SetVuValue(); + Seq->TracksToRefresh.clear(); + } } void MainWindow::AddUpdatePlugin(Plugin *p) @@ -1897,13 +1905,6 @@ } } -void MainWindow::OnKillTimer(wxTimerEvent &WXUNUSED(event)) -{ - LOG; - cout << "[MAINWIN] Killing Threads" << endl; - exit (0); -} - void MainWindow::OnIdle(wxIdleEvent &WXUNUSED(event)) { // LOG; @@ -2240,7 +2241,6 @@ // event EVT_CLOSE(MainWindow::OnClose) EVT_TIMER(MainWin_SeqTimer, MainWindow::OnTimer) - EVT_TIMER(MainWin_KillTimer, MainWindow::OnKillTimer) /* // button EVT_BUTTON(FileLoader_Start, MainWindow::OnFileLoaderStart) Modified: trunk/wired/src/gui/MainWindow.h =================================================================== --- trunk/wired/src/gui/MainWindow.h 2009-05-09 22:06:44 UTC (rev 1552) +++ trunk/wired/src/gui/MainWindow.h 2009-05-10 09:37:25 UTC (rev 1553) @@ -76,7 +76,6 @@ void OnAbout(wxCommandEvent &event); void OnIntegratedHelp(wxCommandEvent &event); void OnTimer(wxTimerEvent &event); - void OnKillTimer(wxTimerEvent &event); bool NewSession(); void LoadPlugins(); @@ -277,7 +276,6 @@ MainWin_SelectAll, MainWin_FullScreen, MainWin_SeqTimer, - MainWin_KillTimer, MainWin_FileLoader, MainWin_IntHelp, MainWin_SwitchRack, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-05-09 22:06:47
|
Revision: 1552 http://wired.svn.sourceforge.net/wired/?rev=1552&view=rev Author: hdoomsday Date: 2009-05-09 22:06:44 +0000 (Sat, 09 May 2009) Log Message: ----------- [COMPIL] added -rpath: no more LD_LIBRARY_PATH is needed Modified Paths: -------------- trunk/wired/src/Makefile.am trunk/wired/src/gui/MainWindow.cpp trunk/wired/src/gui/Rack.cpp trunk/wired/src/libs/WiredAkai/src/Makefile.am trunk/wired/src/libs/WiredWidgets/src/Makefile.am trunk/wired/src/sequencer/Sequencer.cpp Modified: trunk/wired/src/Makefile.am =================================================================== --- trunk/wired/src/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) +++ trunk/wired/src/Makefile.am 2009-05-09 22:06:44 UTC (rev 1552) @@ -31,6 +31,7 @@ @SAMPLERATE_LIBS@ \ -lsndfile \ -Lfileloader -lfileloader \ + -rpath ${libdir}/wired \ $(DEPS_LIBS) wired_CPPFLAGS = $(shell wx-config --cflags) \ Modified: trunk/wired/src/gui/MainWindow.cpp =================================================================== --- trunk/wired/src/gui/MainWindow.cpp 2009-05-09 21:11:30 UTC (rev 1551) +++ trunk/wired/src/gui/MainWindow.cpp 2009-05-09 22:06:44 UTC (rev 1552) @@ -359,7 +359,7 @@ wxGetApp().m_threads.Add(Seq); SeqTimer = new wxTimer(this, MainWin_SeqTimer); - SeqTimer->Start(40); + SeqTimer->Start(3000); WindowSize = MainWin->GetSize(); WindowPos = MainWin->GetPosition(); Modified: trunk/wired/src/gui/Rack.cpp =================================================================== --- trunk/wired/src/gui/Rack.cpp 2009-05-09 21:11:30 UTC (rev 1551) +++ trunk/wired/src/gui/Rack.cpp 2009-05-09 22:06:44 UTC (rev 1552) @@ -858,6 +858,7 @@ bool DeleteRackAction::Do () { + _deleted->Hide(); return RackPanel->DeleteRack( _deleted, false ); } Modified: trunk/wired/src/libs/WiredAkai/src/Makefile.am =================================================================== --- trunk/wired/src/libs/WiredAkai/src/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) +++ trunk/wired/src/libs/WiredAkai/src/Makefile.am 2009-05-09 22:06:44 UTC (rev 1552) @@ -4,5 +4,5 @@ pkglib_LTLIBRARIES = libWiredAkai.la -libWiredAkai_la_LDFLAGS = -version-info @LIB_WIREDAKAI_VERSION@ +libWiredAkai_la_LDFLAGS = -rpath ${libdir}/wired -version-info @LIB_WIREDAKAI_VERSION@ libWiredAkai_la_SOURCES = akai.cpp list.cpp Modified: trunk/wired/src/libs/WiredWidgets/src/Makefile.am =================================================================== --- trunk/wired/src/libs/WiredWidgets/src/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) +++ trunk/wired/src/libs/WiredWidgets/src/Makefile.am 2009-05-09 22:06:44 UTC (rev 1552) @@ -4,7 +4,7 @@ pkglib_LTLIBRARIES = libWiredWidgets.la -libWiredWidgets_la_LDFLAGS = -version-info @LIB_WIREDWIDGETS_VERSION@ +libWiredWidgets_la_LDFLAGS = -rpath ${libdir}/wired -version-info @LIB_WIREDWIDGETS_VERSION@ libWiredWidgets_la_SOURCES = \ ChoiceButton.cpp \ ChoiceButton.h \ Modified: trunk/wired/src/sequencer/Sequencer.cpp =================================================================== --- trunk/wired/src/sequencer/Sequencer.cpp 2009-05-09 21:11:30 UTC (rev 1551) +++ trunk/wired/src/sequencer/Sequencer.cpp 2009-05-09 22:06:44 UTC (rev 1552) @@ -137,17 +137,13 @@ { if (((*MidiMsg)->Msg[0] == M_START) || ((*MidiMsg)->Msg[0] == M_CONT)) { - SeqMutex.Unlock(); Play(); Yield(); - SeqMutex.Lock(); } else if ((*MidiMsg)->Msg[0] == M_STOP) { - SeqMutex.Unlock(); Stop(); Yield(); - SeqMutex.Lock(); } else for (T = Tracks.begin(); T != Tracks.end(); T++) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hdo...@us...> - 2009-05-09 21:11:36
|
Revision: 1551 http://wired.svn.sourceforge.net/wired/?rev=1551&view=rev Author: hdoomsday Date: 2009-05-09 21:11:30 +0000 (Sat, 09 May 2009) Log Message: ----------- [COMPIL] fixed 1830094 Libraries built incorrectly: so.1.0.0 are all installed in $prefix/lib/wired/ Modified Paths: -------------- trunk/wired/configure.ac trunk/wired/src/codec/wiredcodec/flac/Makefile.am trunk/wired/src/codec/wiredcodec/mpeg/Makefile.am trunk/wired/src/codec/wiredcodec/vorbis/Makefile.am trunk/wired/src/libs/WiredAkai/src/Makefile.am trunk/wired/src/libs/WiredWidgets/src/Makefile.am trunk/wired/src/plugins/akai_sampler/Makefile.am trunk/wired/src/plugins/beatbox/Makefile.am trunk/wired/src/plugins/chorus/Makefile.am trunk/wired/src/plugins/crusher/Makefile.am trunk/wired/src/plugins/delay/Makefile.am trunk/wired/src/plugins/loop_sampler/Makefile.am trunk/wired/src/plugins/reverb/Makefile.am trunk/wired/src/plugins/wahwah/Makefile.am Modified: trunk/wired/configure.ac =================================================================== --- trunk/wired/configure.ac 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/configure.ac 2009-05-09 21:11:30 UTC (rev 1551) @@ -2,8 +2,27 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([Wired], [0.6.1], [wi...@bl...]) +AC_INIT([Wired], [0.7.0], [wi...@bl...]) +LIB_WIREDCODECS_VERSION=1:0:0 +LIB_WIREDPLUGIN_VERSION=1:0:0 +LIB_WIREDAKAI_VERSION=1:0:0 +LIB_WIREDWIDGETS_VERSION=1:0:0 +# | | | +# +------+ | +---+ +# | | | +# current:revision:age +# | | | +# | | +- increment if interfaces have been added +# | | set to zero if interfaces have been removed +# | | or changed +# | +- increment if source code has changed +# | set to zero if current is incremented +# +- increment if interfaces have been added, removed or changed +AC_SUBST(LIB_WIREDWIDGETS_VERSION) +AC_SUBST(LIB_WIREDAKAI_VERSION) +AC_SUBST(LIB_WIREDPLUGIN_VERSION) +AC_SUBST(LIB_WIREDCODECS_VERSION) # Auxiliary files. AC_CONFIG_AUX_DIR([config]) Modified: trunk/wired/src/codec/wiredcodec/flac/Makefile.am =================================================================== --- trunk/wired/src/codec/wiredcodec/flac/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/codec/wiredcodec/flac/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -4,6 +4,7 @@ pkglib_LTLIBRARIES = libWiredFlac.la +libWiredFlac_la_LDFLAGS = -version-info @LIB_WIREDCODECS_VERSION@ libWiredFlac_la_SOURCES = \ WiredLibFlac.cpp Modified: trunk/wired/src/codec/wiredcodec/mpeg/Makefile.am =================================================================== --- trunk/wired/src/codec/wiredcodec/mpeg/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/codec/wiredcodec/mpeg/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -4,6 +4,7 @@ pkglib_LTLIBRARIES = libWiredMpeg.la +libWiredMpeg_la_LDFLAGS = -version-info @LIB_WIREDCODECS_VERSION@ libWiredMpeg_la_SOURCES = \ WiredLibMpeg.cpp Modified: trunk/wired/src/codec/wiredcodec/vorbis/Makefile.am =================================================================== --- trunk/wired/src/codec/wiredcodec/vorbis/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/codec/wiredcodec/vorbis/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -4,6 +4,7 @@ pkglib_LTLIBRARIES = libWiredVorbis.la +libWiredVorbis_la_LDFLAGS = -version-info @LIB_WIREDCODECS_VERSION@ libWiredVorbis_la_SOURCES = \ WiredLibVorbis.cpp Modified: trunk/wired/src/libs/WiredAkai/src/Makefile.am =================================================================== --- trunk/wired/src/libs/WiredAkai/src/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/libs/WiredAkai/src/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -2,7 +2,7 @@ CPPFLAGS = $(shell wx-config --cflags) -I../include -I../../../gui -I../../../plugins -I../../../fileloader -I../../../sequencer -I../../../redist -I../../../engine -I../../../mixer -I../../../midi -I../../../midi/portmidi/pm_common -I../../../midi/portmidi/porttime -I../../../editmidi -I../../../undo -lib_LTLIBRARIES = libWiredAkai.la +pkglib_LTLIBRARIES = libWiredAkai.la -libWiredAkai_la_LDFLAGS = -avoid-version +libWiredAkai_la_LDFLAGS = -version-info @LIB_WIREDAKAI_VERSION@ libWiredAkai_la_SOURCES = akai.cpp list.cpp Modified: trunk/wired/src/libs/WiredWidgets/src/Makefile.am =================================================================== --- trunk/wired/src/libs/WiredWidgets/src/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/libs/WiredWidgets/src/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -2,9 +2,9 @@ CPPFLAGS = $(shell wx-config --cflags) -I../../../gui -I../../../plugins -I../../../fileloader -I../../../sequencer -I../../../redist -I../../../engine -I../../../mixer -I../../../midi -I../../../midi/portmidi/pm_common -I../../../midi/portmidi/porttime -I../../../editmidi -I../../../undo -lib_LTLIBRARIES = libWiredWidgets.la +pkglib_LTLIBRARIES = libWiredWidgets.la -libWiredWidgets_la_LDFLAGS = -avoid-version +libWiredWidgets_la_LDFLAGS = -version-info @LIB_WIREDWIDGETS_VERSION@ libWiredWidgets_la_SOURCES = \ ChoiceButton.cpp \ ChoiceButton.h \ Modified: trunk/wired/src/plugins/akai_sampler/Makefile.am =================================================================== --- trunk/wired/src/plugins/akai_sampler/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/plugins/akai_sampler/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -11,7 +11,7 @@ pkglib_LTLIBRARIES = libWiredSampler.la -libWiredSampler_la_LDFLAGS = -avoid-version +libWiredSampler_la_LDFLAGS = -version-info @LIB_WIREDPLUGIN_VERSION@ libWiredSampler_la_SOURCES = \ AkaiSampler.cpp \ ASClavier.cpp \ Modified: trunk/wired/src/plugins/beatbox/Makefile.am =================================================================== --- trunk/wired/src/plugins/beatbox/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/plugins/beatbox/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -9,7 +9,7 @@ pkglib_LTLIBRARIES = libWiredBeatBox.la -libWiredBeatBox_la_LDFLAGS = -avoid-version +libWiredBeatBox_la_LDFLAGS = -version-info @LIB_WIREDPLUGIN_VERSION@ libWiredBeatBox_la_SOURCES = \ ../../redist/Polyphony.cpp \ BeatBox.cpp \ Modified: trunk/wired/src/plugins/chorus/Makefile.am =================================================================== --- trunk/wired/src/plugins/chorus/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/plugins/chorus/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -4,7 +4,7 @@ pkglib_LTLIBRARIES = libWiredChorus.la -libWiredChorus_la_LDFLAGS = -avoid-version +libWiredChorus_la_LDFLAGS = -version-info @LIB_WIREDPLUGIN_VERSION@ libWiredChorus_la_SOURCES = \ ChorusPlug.cpp \ Effect.cpp \ Modified: trunk/wired/src/plugins/crusher/Makefile.am =================================================================== --- trunk/wired/src/plugins/crusher/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/plugins/crusher/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -4,7 +4,7 @@ pkglib_LTLIBRARIES = libWiredCrusher.la -libWiredCrusher_la_LDFLAGS = -avoid-version +libWiredCrusher_la_LDFLAGS = -version-info @LIB_WIREDPLUGIN_VERSION@ libWiredCrusher_la_SOURCES = \ CrusherPlug.cpp \ ../../redist/Plugin.cpp Modified: trunk/wired/src/plugins/delay/Makefile.am =================================================================== --- trunk/wired/src/plugins/delay/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/plugins/delay/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -4,7 +4,7 @@ pkglib_LTLIBRARIES = libWiredDelay.la -libWiredDelay_la_LDFLAGS = -avoid-version +libWiredDelay_la_LDFLAGS = -version-info @LIB_WIREDPLUGIN_VERSION@ libWiredDelay_la_SOURCES = \ DelayPlug.cpp \ ../../redist/Plugin.cpp Modified: trunk/wired/src/plugins/loop_sampler/Makefile.am =================================================================== --- trunk/wired/src/plugins/loop_sampler/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/plugins/loop_sampler/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -4,7 +4,7 @@ pkglib_LTLIBRARIES = libWiredLoopSampler.la -libWiredLoopSampler_la_LDFLAGS = -avoid-version +libWiredLoopSampler_la_LDFLAGS = -version-info @LIB_WIREDPLUGIN_VERSION@ libWiredLoopSampler_la_SOURCES = \ LoopSampler.cpp \ LoopSamplerView.cpp \ Modified: trunk/wired/src/plugins/reverb/Makefile.am =================================================================== --- trunk/wired/src/plugins/reverb/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/plugins/reverb/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -4,7 +4,7 @@ pkglib_LTLIBRARIES = libWiredReverb.la -libWiredReverb_la_LDFLAGS = -avoid-version +libWiredReverb_la_LDFLAGS = -version-info @LIB_WIREDPLUGIN_VERSION@ libWiredReverb_la_SOURCES = \ Stk.cpp \ Effect.cpp \ Modified: trunk/wired/src/plugins/wahwah/Makefile.am =================================================================== --- trunk/wired/src/plugins/wahwah/Makefile.am 2009-05-08 09:01:47 UTC (rev 1550) +++ trunk/wired/src/plugins/wahwah/Makefile.am 2009-05-09 21:11:30 UTC (rev 1551) @@ -4,7 +4,7 @@ pkglib_LTLIBRARIES = libWiredWahwah.la -libWiredWahwah_la_LDFLAGS = -avoid-version +libWiredWahwah_la_LDFLAGS = -version-info @LIB_WIREDPLUGIN_VERSION@ libWiredWahwah_la_SOURCES = \ WahwahPlug.cpp \ ../../redist/Plugin.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |