mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-03 12:19:33 +01:00
r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600
Trunk merge conflicts resolved git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
b0b7234458
commit
79986643c0
372 changed files with 20759 additions and 10250 deletions
|
|
@ -53,7 +53,7 @@ namespace ARDOUR {
|
|||
|
||||
class IOSelector : public Gtk::VBox {
|
||||
public:
|
||||
IOSelector (ARDOUR::Session&, ARDOUR::IO&, bool for_input);
|
||||
IOSelector (ARDOUR::Session&, boost::shared_ptr<ARDOUR::IO>, bool for_input);
|
||||
~IOSelector ();
|
||||
|
||||
void redisplay ();
|
||||
|
|
@ -67,9 +67,9 @@ class IOSelector : public Gtk::VBox {
|
|||
|
||||
protected:
|
||||
ARDOUR::Session& session;
|
||||
|
||||
|
||||
private:
|
||||
ARDOUR::IO& io;
|
||||
boost::shared_ptr<ARDOUR::IO> io;
|
||||
bool for_input;
|
||||
ARDOUR::Port *selected_port;
|
||||
|
||||
|
|
@ -135,7 +135,7 @@ class IOSelector : public Gtk::VBox {
|
|||
class IOSelectorWindow : public ArdourDialog
|
||||
{
|
||||
public:
|
||||
IOSelectorWindow (ARDOUR::Session&, ARDOUR::IO&, bool for_input, bool can_cancel=false);
|
||||
IOSelectorWindow (ARDOUR::Session&, boost::shared_ptr<ARDOUR::IO>, bool for_input, bool can_cancel=false);
|
||||
~IOSelectorWindow ();
|
||||
|
||||
IOSelector& selector() { return _selector; }
|
||||
|
|
@ -162,7 +162,7 @@ class IOSelectorWindow : public ArdourDialog
|
|||
class PortInsertUI : public Gtk::VBox
|
||||
{
|
||||
public:
|
||||
PortInsertUI (ARDOUR::Session&, ARDOUR::PortInsert&);
|
||||
PortInsertUI (ARDOUR::Session&, boost::shared_ptr<ARDOUR::PortInsert>);
|
||||
|
||||
void redisplay ();
|
||||
void finished (IOSelector::Result);
|
||||
|
|
@ -178,7 +178,7 @@ class PortInsertUI : public Gtk::VBox
|
|||
class PortInsertWindow : public ArdourDialog
|
||||
{
|
||||
public:
|
||||
PortInsertWindow (ARDOUR::Session&, ARDOUR::PortInsert&, bool can_cancel=false);
|
||||
PortInsertWindow (ARDOUR::Session&, boost::shared_ptr<ARDOUR::PortInsert>, bool can_cancel=false);
|
||||
|
||||
protected:
|
||||
void on_map ();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue