2005-09-25 14:42:24 -04:00
|
|
|
/*
|
2007-03-18 02:07:08 -04:00
|
|
|
Copyright (C) 2001-2007 Paul Davis
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <cstdlib>
|
|
|
|
|
|
|
|
#include <sigc++/bind.h>
|
2005-11-29 12:27:58 -05:00
|
|
|
#include <gtkmm/settings.h>
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
#include <pbd/error.h>
|
|
|
|
#include <pbd/textreceiver.h>
|
|
|
|
#include <pbd/failed_constructor.h>
|
|
|
|
#include <pbd/pthread_utils.h>
|
|
|
|
|
|
|
|
#include <jack/jack.h>
|
|
|
|
|
|
|
|
#include <ardour/version.h>
|
|
|
|
#include <ardour/ardour.h>
|
|
|
|
#include <ardour/audioengine.h>
|
|
|
|
|
2005-09-25 16:33:00 -04:00
|
|
|
#include <gtkmm/main.h>
|
|
|
|
#include <gtkmm2ext/popup.h>
|
|
|
|
#include <gtkmm2ext/utils.h>
|
2005-09-25 14:42:24 -04:00
|
|
|
|
2006-11-19 11:45:16 -05:00
|
|
|
#include "svn_revision.h"
|
2005-09-25 14:42:24 -04:00
|
|
|
#include "version.h"
|
|
|
|
#include "ardour_ui.h"
|
|
|
|
#include "opts.h"
|
2007-01-09 18:24:54 -05:00
|
|
|
#include "enums.h"
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
#include "i18n.h"
|
|
|
|
|
|
|
|
using namespace Gtk;
|
|
|
|
using namespace GTK_ARDOUR;
|
|
|
|
using namespace ARDOUR;
|
Large nasty commit in the form of a 5000 line patch chock-full of completely
unecessary changes. (Sorry, doing a "sprint" based thing, this is the end of the first one)
Achieved MIDI track and bus creation, associated Jack port and diskstream creation, and minimal GUI stuff for creating them. Should be set to start work on actually recording and playing midi to/from disk now.
Relevant (significant) changes:
- Creation of a Buffer class. Base class is type agnostic so things can point to a buffer but not care what kind it is (otherwise it'd be a template). Derived into AudioBuffer and MidiBuffer, with a type tag because checking type is necessary in parts of the code where dynamic_cast wouldn't be wise. Originally I considered this a hack, but passing around a type proved to be a very good solution to all the other problems (below). There is a 1:1 mapping between jack port data types and ardour Buffer types (with a conversion function), but that's easily removed if it ever becomes necessary. Having the type scoped in the Buffer class is maybe not the best spot for it, but whatever (this is proof of concept kinda stuff right now...)
- IO now has a "default" port type (passed to the constructor and stored as a member), used by ensure_io (and similar) to create n ports. IO::register_***_port has a type argument that defaults to the default type if not passed. Rationale: previous IO API is identical, no changes needed to existing code, but path is paved for multiple port types in one IO, which we will need for eg synth plugin inserts, among other things. This is not quite ideal (best would be to only have the two port register functions and have them take a type), but the alternative is a lot of work (namely destroying the 'ensure' functions and everything that uses them) for very little gain. (I am convinced after quite a few tries at the whiteboard that subclassing IO in any way is not a feasible option, look at it's inheritance diagram in Doxygen and you can see why)
- AudioEngine::register_audio_input_port is now register_input_port and takes a type argument. Ditto for output.
- (Most significant change) AudioDiskstream abstracted into Distream, and sibling MidiDiskstream created. Very much still a work in progress, but Diskstream is there to switch references over to (most already are), which is the important part. It is still unclear what the MIDI diskstream's relation to channels is, but I'm pretty sure they will be single channel only (so SMF Type 0) since noone can come up with a reason otherwise.
- MidiTrack creation. Same thing as AudioTrack but with a different default type basically. No big deal here.
- Random cleanups and variable renamings etc. because I have OCD and can't help myself. :)
Known broken: Loading of sessions containing MIDI tracks.
git-svn-id: svn://localhost/ardour2/branches/midi@641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-26 12:01:34 -04:00
|
|
|
using namespace PBD;
|
2005-09-25 16:33:00 -04:00
|
|
|
using namespace sigc;
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
TextReceiver text_receiver ("ardour");
|
|
|
|
|
|
|
|
extern int curvetest (string);
|
|
|
|
|
|
|
|
static ARDOUR_UI *ui = 0;
|
|
|
|
|
|
|
|
string
|
|
|
|
which_ui_rcfile ()
|
|
|
|
{
|
|
|
|
string rcfile;
|
2006-03-17 12:39:21 -05:00
|
|
|
char* env;
|
|
|
|
|
|
|
|
if ((env = getenv ("ARDOUR2_UI_RC")) != 0 && strlen (env)) {
|
|
|
|
rcfile = env;
|
|
|
|
} else {
|
|
|
|
rcfile = "ardour2_ui.rc";
|
|
|
|
}
|
|
|
|
|
|
|
|
rcfile = find_config_file (rcfile);
|
2005-09-25 14:42:24 -04:00
|
|
|
|
2006-03-17 12:39:21 -05:00
|
|
|
if (rcfile.empty()) {
|
|
|
|
warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR2_UI_RC to point to a valid UI style file") << endmsg;
|
2006-06-08 19:46:42 -04:00
|
|
|
} else {
|
|
|
|
cerr << "Loading ui configuration file " << rcfile << endl;
|
2006-03-12 11:19:03 -05:00
|
|
|
}
|
2006-06-08 19:46:42 -04:00
|
|
|
|
2005-09-25 14:42:24 -04:00
|
|
|
return rcfile;
|
|
|
|
}
|
|
|
|
|
|
|
|
gint
|
|
|
|
show_ui_callback (void *arg)
|
|
|
|
{
|
|
|
|
ARDOUR_UI * ui = (ARDOUR_UI *) arg;
|
|
|
|
|
|
|
|
ui->hide_splash();
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gui_jack_error ()
|
|
|
|
{
|
2006-08-30 22:28:42 -04:00
|
|
|
MessageDialog win (_("Ardour could not connect to JACK."),
|
2006-04-19 16:42:17 -04:00
|
|
|
false,
|
|
|
|
Gtk::MESSAGE_INFO,
|
|
|
|
(Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
|
|
|
|
win.set_secondary_text(_("There are several possible reasons:\n\
|
2005-09-25 14:42:24 -04:00
|
|
|
\n\
|
|
|
|
1) JACK is not running.\n\
|
|
|
|
2) JACK is running as another user, perhaps root.\n\
|
|
|
|
3) There is already another client called \"ardour\".\n\
|
|
|
|
\n\
|
|
|
|
Please consider the possibilities, and perhaps (re)start JACK."));
|
2006-04-19 16:42:17 -04:00
|
|
|
|
|
|
|
win.add_button (Stock::QUIT, RESPONSE_CLOSE);
|
|
|
|
win.set_default_response (RESPONSE_CLOSE);
|
2005-12-08 13:53:43 -05:00
|
|
|
|
2005-09-25 14:42:24 -04:00
|
|
|
win.show_all ();
|
2005-10-27 16:51:57 -04:00
|
|
|
win.set_position (Gtk::WIN_POS_CENTER);
|
2005-09-25 14:42:24 -04:00
|
|
|
|
2006-08-30 22:28:42 -04:00
|
|
|
if (!no_splash) {
|
2006-11-19 11:45:16 -05:00
|
|
|
ui->hide_splash ();
|
2006-08-30 22:28:42 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* we just don't care about the result, but we want to block */
|
2005-09-25 14:42:24 -04:00
|
|
|
|
2005-12-08 13:53:43 -05:00
|
|
|
win.run ();
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
2006-05-24 14:41:52 -04:00
|
|
|
static bool
|
|
|
|
maybe_load_session ()
|
|
|
|
{
|
2006-08-09 21:22:45 -04:00
|
|
|
/* If no session name is given: we're not loading a session yet, nor creating a new one */
|
|
|
|
if (!session_name.length()) {
|
|
|
|
ui->hide_splash ();
|
|
|
|
if (!Config->get_no_new_session_dialog()) {
|
2007-03-18 02:07:08 -04:00
|
|
|
if (!ui->new_session ()) {
|
|
|
|
return false;
|
|
|
|
}
|
2006-08-09 21:22:45 -04:00
|
|
|
}
|
2006-05-24 14:41:52 -04:00
|
|
|
|
2006-08-09 21:22:45 -04:00
|
|
|
return true;
|
|
|
|
}
|
2006-05-24 14:41:52 -04:00
|
|
|
|
2006-08-09 21:22:45 -04:00
|
|
|
/* Load session or start the new session dialog */
|
|
|
|
string name, path;
|
2006-05-24 14:41:52 -04:00
|
|
|
|
2006-08-09 21:22:45 -04:00
|
|
|
bool isnew;
|
2006-05-24 14:41:52 -04:00
|
|
|
|
2006-08-09 21:22:45 -04:00
|
|
|
if (Session::find_session (session_name, path, name, isnew)) {
|
|
|
|
error << string_compose(_("could not load command line session \"%1\""), session_name) << endmsg;
|
|
|
|
return false;
|
|
|
|
}
|
2006-05-24 14:41:52 -04:00
|
|
|
|
2006-08-09 21:22:45 -04:00
|
|
|
if (!new_session) {
|
|
|
|
|
|
|
|
/* Loading a session, but the session doesn't exist */
|
|
|
|
if (isnew) {
|
2007-01-09 18:24:54 -05:00
|
|
|
error << string_compose (_("\n\nNo session named \"%1\" exists.\n"
|
|
|
|
"To create it from the command line, start ardour as \"ardour --new %1"), path)
|
|
|
|
<< endmsg;
|
2006-08-09 21:22:45 -04:00
|
|
|
return false;
|
2006-05-24 14:41:52 -04:00
|
|
|
}
|
|
|
|
|
2007-01-09 18:24:54 -05:00
|
|
|
if (ui->load_session (path, name)) {
|
|
|
|
/* it failed */
|
|
|
|
return false;
|
|
|
|
}
|
2006-05-24 14:41:52 -04:00
|
|
|
|
|
|
|
} else {
|
2006-08-09 21:22:45 -04:00
|
|
|
|
2006-11-19 11:45:16 -05:00
|
|
|
/* TODO: This bit of code doesn't work properly yet
|
|
|
|
Glib::signal_idle().connect (bind (mem_fun (*ui, &ARDOUR_UI::cmdline_new_session), path));
|
|
|
|
ui->set_will_create_new_session_automatically (true);
|
|
|
|
*/
|
|
|
|
|
2006-08-09 21:22:45 -04:00
|
|
|
/* Show the NSD */
|
2006-05-24 14:41:52 -04:00
|
|
|
ui->hide_splash ();
|
|
|
|
if (!Config->get_no_new_session_dialog()) {
|
2007-03-18 02:07:08 -04:00
|
|
|
if (!ui->new_session ()) {
|
|
|
|
return false;
|
|
|
|
}
|
2006-05-24 14:41:52 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
Large nasty commit in the form of a 5000 line patch chock-full of completely
unecessary changes. (Sorry, doing a "sprint" based thing, this is the end of the first one)
Achieved MIDI track and bus creation, associated Jack port and diskstream creation, and minimal GUI stuff for creating them. Should be set to start work on actually recording and playing midi to/from disk now.
Relevant (significant) changes:
- Creation of a Buffer class. Base class is type agnostic so things can point to a buffer but not care what kind it is (otherwise it'd be a template). Derived into AudioBuffer and MidiBuffer, with a type tag because checking type is necessary in parts of the code where dynamic_cast wouldn't be wise. Originally I considered this a hack, but passing around a type proved to be a very good solution to all the other problems (below). There is a 1:1 mapping between jack port data types and ardour Buffer types (with a conversion function), but that's easily removed if it ever becomes necessary. Having the type scoped in the Buffer class is maybe not the best spot for it, but whatever (this is proof of concept kinda stuff right now...)
- IO now has a "default" port type (passed to the constructor and stored as a member), used by ensure_io (and similar) to create n ports. IO::register_***_port has a type argument that defaults to the default type if not passed. Rationale: previous IO API is identical, no changes needed to existing code, but path is paved for multiple port types in one IO, which we will need for eg synth plugin inserts, among other things. This is not quite ideal (best would be to only have the two port register functions and have them take a type), but the alternative is a lot of work (namely destroying the 'ensure' functions and everything that uses them) for very little gain. (I am convinced after quite a few tries at the whiteboard that subclassing IO in any way is not a feasible option, look at it's inheritance diagram in Doxygen and you can see why)
- AudioEngine::register_audio_input_port is now register_input_port and takes a type argument. Ditto for output.
- (Most significant change) AudioDiskstream abstracted into Distream, and sibling MidiDiskstream created. Very much still a work in progress, but Diskstream is there to switch references over to (most already are), which is the important part. It is still unclear what the MIDI diskstream's relation to channels is, but I'm pretty sure they will be single channel only (so SMF Type 0) since noone can come up with a reason otherwise.
- MidiTrack creation. Same thing as AudioTrack but with a different default type basically. No big deal here.
- Random cleanups and variable renamings etc. because I have OCD and can't help myself. :)
Known broken: Loading of sessions containing MIDI tracks.
git-svn-id: svn://localhost/ardour2/branches/midi@641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-26 12:01:34 -04:00
|
|
|
#ifdef VST_SUPPORT
|
|
|
|
/* this is called from the entry point of a wine-compiled
|
|
|
|
executable that is linked against gtk2_ardour built
|
|
|
|
as a shared library.
|
|
|
|
*/
|
|
|
|
extern "C" {
|
|
|
|
int ardour_main (int argc, char *argv[])
|
|
|
|
#else
|
|
|
|
int main (int argc, char *argv[])
|
|
|
|
#endif
|
2006-06-21 14:14:45 -04:00
|
|
|
|
2005-09-25 14:42:24 -04:00
|
|
|
{
|
|
|
|
ARDOUR::AudioEngine *engine;
|
2005-12-02 14:18:26 -05:00
|
|
|
vector<Glib::ustring> null_file_list;
|
2005-09-25 14:42:24 -04:00
|
|
|
|
2007-01-09 18:24:54 -05:00
|
|
|
Glib::thread_init();
|
2005-09-25 14:42:24 -04:00
|
|
|
gtk_set_locale ();
|
|
|
|
|
2007-01-09 18:24:54 -05:00
|
|
|
(void) bindtextdomain (PACKAGE, LOCALEDIR);
|
2007-01-28 12:44:13 -05:00
|
|
|
/* our i18n translations are all in UTF-8, so make sure
|
|
|
|
that even if the user locale doesn't specify UTF-8,
|
|
|
|
we use that when handling them.
|
|
|
|
*/
|
|
|
|
(void) bind_textdomain_codeset (PACKAGE,"UTF-8");
|
2005-09-25 14:42:24 -04:00
|
|
|
(void) textdomain (PACKAGE);
|
|
|
|
|
|
|
|
pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
|
|
|
|
|
2007-01-09 18:24:54 -05:00
|
|
|
// catch error message system signals ();
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
text_receiver.listen_to (error);
|
|
|
|
text_receiver.listen_to (info);
|
|
|
|
text_receiver.listen_to (fatal);
|
|
|
|
text_receiver.listen_to (warning);
|
|
|
|
|
|
|
|
if (parse_opts (argc, argv)) {
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (curvetest_file) {
|
|
|
|
return curvetest (curvetest_file);
|
|
|
|
}
|
2005-12-02 14:18:26 -05:00
|
|
|
|
2005-09-25 14:42:24 -04:00
|
|
|
cout << _("Ardour/GTK ")
|
|
|
|
<< VERSIONSTRING
|
|
|
|
<< _("\n (built using ")
|
2006-11-19 11:45:16 -05:00
|
|
|
<< ardour_svn_revision
|
2005-09-25 14:42:24 -04:00
|
|
|
#ifdef __GNUC__
|
|
|
|
<< _(" and GCC version ") << __VERSION__
|
|
|
|
#endif
|
|
|
|
<< ')'
|
|
|
|
<< endl;
|
|
|
|
|
|
|
|
if (just_version) {
|
|
|
|
exit (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (no_splash) {
|
2007-03-18 02:07:08 -04:00
|
|
|
cerr << _("Copyright (C) 1999-2007 Paul Davis") << endl
|
2005-09-25 14:42:24 -04:00
|
|
|
<< _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl
|
|
|
|
<< endl
|
|
|
|
<< _("Ardour comes with ABSOLUTELY NO WARRANTY") << endl
|
|
|
|
<< _("not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") << endl
|
|
|
|
<< _("This is free software, and you are welcome to redistribute it ") << endl
|
|
|
|
<< _("under certain conditions; see the source for copying conditions.")
|
|
|
|
<< endl;
|
|
|
|
}
|
|
|
|
|
2007-03-18 02:07:08 -04:00
|
|
|
/* some GUI objects need this */
|
|
|
|
|
|
|
|
PBD::ID::init ();
|
|
|
|
|
2006-08-30 22:28:42 -04:00
|
|
|
try {
|
|
|
|
ui = new ARDOUR_UI (&argc, &argv, which_ui_rcfile());
|
|
|
|
} catch (failed_constructor& err) {
|
2005-09-25 14:42:24 -04:00
|
|
|
error << _("could not create ARDOUR GUI") << endmsg;
|
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
2007-01-09 18:24:54 -05:00
|
|
|
if (!keybindings_path.empty()) {
|
|
|
|
ui->set_keybindings_path (keybindings_path);
|
|
|
|
}
|
2005-09-25 14:42:24 -04:00
|
|
|
|
|
|
|
if (!no_splash) {
|
|
|
|
ui->show_splash ();
|
|
|
|
if (session_name.length()) {
|
2006-08-30 22:28:42 -04:00
|
|
|
g_timeout_add (4000, show_ui_callback, ui);
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
}
|
2006-08-30 22:28:42 -04:00
|
|
|
|
|
|
|
try {
|
|
|
|
ARDOUR::init (*engine, use_vst, try_hw_optimization);
|
2007-01-09 18:24:54 -05:00
|
|
|
setup_gtk_ardour_enums ();
|
2006-10-21 15:01:50 -04:00
|
|
|
Config->set_current_owner (ConfigVariableBase::Interface);
|
2007-04-12 19:20:37 -04:00
|
|
|
ui->setup_profile ();
|
2007-01-09 18:24:54 -05:00
|
|
|
|
|
|
|
try {
|
|
|
|
engine = new ARDOUR::AudioEngine (jack_client_name);
|
|
|
|
} catch (AudioEngine::NoBackendAvailable& err) {
|
|
|
|
gui_jack_error ();
|
|
|
|
error << string_compose (_("Could not connect to JACK server as \"%1\""), jack_client_name) << endmsg;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-08-30 22:28:42 -04:00
|
|
|
ui->set_engine (*engine);
|
2007-01-09 18:24:54 -05:00
|
|
|
|
2005-12-02 14:18:26 -05:00
|
|
|
} catch (failed_constructor& err) {
|
2005-09-25 14:42:24 -04:00
|
|
|
error << _("could not initialize Ardour.") << endmsg;
|
2005-12-02 14:18:26 -05:00
|
|
|
return -1;
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
2007-01-09 18:24:54 -05:00
|
|
|
ui->start_engine ();
|
2006-08-30 22:28:42 -04:00
|
|
|
|
2006-05-24 14:41:52 -04:00
|
|
|
if (maybe_load_session ()) {
|
|
|
|
ui->run (text_receiver);
|
|
|
|
ui = 0;
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
delete engine;
|
|
|
|
ARDOUR::cleanup ();
|
2007-03-18 02:07:08 -04:00
|
|
|
|
|
|
|
if (ui) {
|
|
|
|
ui->kill();
|
|
|
|
}
|
|
|
|
|
|
|
|
pthread_cancel_all ();
|
|
|
|
|
|
|
|
exit (0);
|
2006-05-24 15:19:19 -04:00
|
|
|
|
Large nasty commit in the form of a 5000 line patch chock-full of completely
unecessary changes. (Sorry, doing a "sprint" based thing, this is the end of the first one)
Achieved MIDI track and bus creation, associated Jack port and diskstream creation, and minimal GUI stuff for creating them. Should be set to start work on actually recording and playing midi to/from disk now.
Relevant (significant) changes:
- Creation of a Buffer class. Base class is type agnostic so things can point to a buffer but not care what kind it is (otherwise it'd be a template). Derived into AudioBuffer and MidiBuffer, with a type tag because checking type is necessary in parts of the code where dynamic_cast wouldn't be wise. Originally I considered this a hack, but passing around a type proved to be a very good solution to all the other problems (below). There is a 1:1 mapping between jack port data types and ardour Buffer types (with a conversion function), but that's easily removed if it ever becomes necessary. Having the type scoped in the Buffer class is maybe not the best spot for it, but whatever (this is proof of concept kinda stuff right now...)
- IO now has a "default" port type (passed to the constructor and stored as a member), used by ensure_io (and similar) to create n ports. IO::register_***_port has a type argument that defaults to the default type if not passed. Rationale: previous IO API is identical, no changes needed to existing code, but path is paved for multiple port types in one IO, which we will need for eg synth plugin inserts, among other things. This is not quite ideal (best would be to only have the two port register functions and have them take a type), but the alternative is a lot of work (namely destroying the 'ensure' functions and everything that uses them) for very little gain. (I am convinced after quite a few tries at the whiteboard that subclassing IO in any way is not a feasible option, look at it's inheritance diagram in Doxygen and you can see why)
- AudioEngine::register_audio_input_port is now register_input_port and takes a type argument. Ditto for output.
- (Most significant change) AudioDiskstream abstracted into Distream, and sibling MidiDiskstream created. Very much still a work in progress, but Diskstream is there to switch references over to (most already are), which is the important part. It is still unclear what the MIDI diskstream's relation to channels is, but I'm pretty sure they will be single channel only (so SMF Type 0) since noone can come up with a reason otherwise.
- MidiTrack creation. Same thing as AudioTrack but with a different default type basically. No big deal here.
- Random cleanups and variable renamings etc. because I have OCD and can't help myself. :)
Known broken: Loading of sessions containing MIDI tracks.
git-svn-id: svn://localhost/ardour2/branches/midi@641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-26 12:01:34 -04:00
|
|
|
return 0;
|
2005-09-25 14:42:24 -04:00
|
|
|
}
|
Large nasty commit in the form of a 5000 line patch chock-full of completely
unecessary changes. (Sorry, doing a "sprint" based thing, this is the end of the first one)
Achieved MIDI track and bus creation, associated Jack port and diskstream creation, and minimal GUI stuff for creating them. Should be set to start work on actually recording and playing midi to/from disk now.
Relevant (significant) changes:
- Creation of a Buffer class. Base class is type agnostic so things can point to a buffer but not care what kind it is (otherwise it'd be a template). Derived into AudioBuffer and MidiBuffer, with a type tag because checking type is necessary in parts of the code where dynamic_cast wouldn't be wise. Originally I considered this a hack, but passing around a type proved to be a very good solution to all the other problems (below). There is a 1:1 mapping between jack port data types and ardour Buffer types (with a conversion function), but that's easily removed if it ever becomes necessary. Having the type scoped in the Buffer class is maybe not the best spot for it, but whatever (this is proof of concept kinda stuff right now...)
- IO now has a "default" port type (passed to the constructor and stored as a member), used by ensure_io (and similar) to create n ports. IO::register_***_port has a type argument that defaults to the default type if not passed. Rationale: previous IO API is identical, no changes needed to existing code, but path is paved for multiple port types in one IO, which we will need for eg synth plugin inserts, among other things. This is not quite ideal (best would be to only have the two port register functions and have them take a type), but the alternative is a lot of work (namely destroying the 'ensure' functions and everything that uses them) for very little gain. (I am convinced after quite a few tries at the whiteboard that subclassing IO in any way is not a feasible option, look at it's inheritance diagram in Doxygen and you can see why)
- AudioEngine::register_audio_input_port is now register_input_port and takes a type argument. Ditto for output.
- (Most significant change) AudioDiskstream abstracted into Distream, and sibling MidiDiskstream created. Very much still a work in progress, but Diskstream is there to switch references over to (most already are), which is the important part. It is still unclear what the MIDI diskstream's relation to channels is, but I'm pretty sure they will be single channel only (so SMF Type 0) since noone can come up with a reason otherwise.
- MidiTrack creation. Same thing as AudioTrack but with a different default type basically. No big deal here.
- Random cleanups and variable renamings etc. because I have OCD and can't help myself. :)
Known broken: Loading of sessions containing MIDI tracks.
git-svn-id: svn://localhost/ardour2/branches/midi@641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-26 12:01:34 -04:00
|
|
|
#ifdef VST_SUPPORT
|
|
|
|
} // end of extern C block
|
|
|
|
#endif
|
2005-09-25 14:42:24 -04:00
|
|
|
|