projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct msg in fatal error
[ardour.git]
/
gtk2_ardour
/
bundle_manager.h
diff --git
a/gtk2_ardour/bundle_manager.h
b/gtk2_ardour/bundle_manager.h
index e7ce049da560480ef3026450d1c8369ea7ab758b..71b99684d706e1350c7ecae9669313ea9968b1d6 100644
(file)
--- a/
gtk2_ardour/bundle_manager.h
+++ b/
gtk2_ardour/bundle_manager.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2007 Paul Davis
+ Copyright (C) 2007 Paul Davis
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
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
@@
-20,12
+20,14
@@
#ifndef __ardour_ui_bundle_manager_h__
#define __ardour_ui_bundle_manager_h__
#ifndef __ardour_ui_bundle_manager_h__
#define __ardour_ui_bundle_manager_h__
-#include <gtkmm/treeview.h>
-#include <gtkmm/liststore.h>
#include <gtkmm/entry.h>
#include <gtkmm/entry.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/treeview.h>
+
+#include "ardour/user_bundle.h"
+
#include "ardour_dialog.h"
#include "port_matrix.h"
#include "ardour_dialog.h"
#include "port_matrix.h"
-#include "i18n.h"
namespace ARDOUR {
class Session;
namespace ARDOUR {
class Session;
@@
-35,33
+37,29
@@
namespace ARDOUR {
class BundleEditorMatrix : public PortMatrix
{
public:
class BundleEditorMatrix : public PortMatrix
{
public:
- BundleEditorMatrix (
ARDOUR::Session &
, boost::shared_ptr<ARDOUR::Bundle>);
+ BundleEditorMatrix (
Gtk::Window *, ARDOUR::Session *
, boost::shared_ptr<ARDOUR::Bundle>);
void set_state (ARDOUR::BundleChannel c[2], bool s);
PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const;
void set_state (ARDOUR::BundleChannel c[2], bool s);
PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const;
- std::string add_channel_name () const;
-
void add_channel ()
;
- bool can_remove_channels (int d) const {
-
return d == OURS
;
- }
+
+
bool can_add_channels (boost::shared_ptr<ARDOUR::Bundle>) const
;
+
+
void add_channel (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::DataType)
;
+ bool can_remove_channels (boost::shared_ptr<ARDOUR::Bundle>) const;
void remove_channel (ARDOUR::BundleChannel);
void remove_channel (ARDOUR::BundleChannel);
- bool can_rename_channels (int d) const {
- return d == OURS;
- }
+ bool can_rename_channels (boost::shared_ptr<ARDOUR::Bundle>) const;
void rename_channel (ARDOUR::BundleChannel);
void setup_ports (int);
bool list_is_global (int) const;
void rename_channel (ARDOUR::BundleChannel);
void setup_ports (int);
bool list_is_global (int) const;
- std::string disassociation_verb () const {
- return _("Disassociate");
- }
+ std::string disassociation_verb () const;
private:
enum {
OTHER = 0,
OURS = 1
};
private:
enum {
OTHER = 0,
OURS = 1
};
-
+
boost::shared_ptr<PortGroup> _port_group;
boost::shared_ptr<ARDOUR::Bundle> _bundle;
};
boost::shared_ptr<PortGroup> _port_group;
boost::shared_ptr<ARDOUR::Bundle> _bundle;
};
@@
-69,7
+67,7
@@
class BundleEditorMatrix : public PortMatrix
class BundleEditor : public ArdourDialog
{
public:
class BundleEditor : public ArdourDialog
{
public:
- BundleEditor (ARDOUR::Session
&, boost::shared_ptr<ARDOUR::UserBundle>, bool
);
+ BundleEditor (ARDOUR::Session
*, boost::shared_ptr<ARDOUR::UserBundle>
);
protected:
void on_map ();
protected:
void on_map ();
@@
-77,19
+75,18
@@
class BundleEditor : public ArdourDialog
private:
void name_changed ();
void input_or_output_changed ();
private:
void name_changed ();
void input_or_output_changed ();
- void
type_changed
();
-
+ void
on_show
();
+
BundleEditorMatrix _matrix;
boost::shared_ptr<ARDOUR::UserBundle> _bundle;
Gtk::Entry _name;
Gtk::ComboBoxText _input_or_output;
BundleEditorMatrix _matrix;
boost::shared_ptr<ARDOUR::UserBundle> _bundle;
Gtk::Entry _name;
Gtk::ComboBoxText _input_or_output;
- Gtk::ComboBoxText _type;
};
class BundleManager : public ArdourDialog
{
public:
};
class BundleManager : public ArdourDialog
{
public:
- BundleManager (ARDOUR::Session
&
);
+ BundleManager (ARDOUR::Session
*
);
private:
private:
@@
-99,6
+96,7
@@
class BundleManager : public ArdourDialog
void add_bundle (boost::shared_ptr<ARDOUR::Bundle>);
void bundle_changed (ARDOUR::Bundle::Change, boost::shared_ptr<ARDOUR::UserBundle>);
void set_button_sensitivity ();
void add_bundle (boost::shared_ptr<ARDOUR::Bundle>);
void bundle_changed (ARDOUR::Bundle::Change, boost::shared_ptr<ARDOUR::UserBundle>);
void set_button_sensitivity ();
+ void row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColumn* c);
class ModelColumns : public Gtk::TreeModelColumnRecord
{
class ModelColumns : public Gtk::TreeModelColumnRecord
{
@@
-107,17
+105,17
@@
class BundleManager : public ArdourDialog
add (name);
add (bundle);
}
add (name);
add (bundle);
}
-
- Gtk::TreeModelColumn<
Glib::u
string> name;
+
+ Gtk::TreeModelColumn<
std::
string> name;
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::UserBundle> > bundle;
};
Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::UserBundle> > bundle;
};
-
+
Gtk::TreeView _tree_view;
Glib::RefPtr<Gtk::ListStore> _list_model;
ModelColumns _list_model_columns;
Gtk::TreeView _tree_view;
Glib::RefPtr<Gtk::ListStore> _list_model;
ModelColumns _list_model_columns;
- ARDOUR::Session& _session;
Gtk::Button edit_button;
Gtk::Button delete_button;
Gtk::Button edit_button;
Gtk::Button delete_button;
+ PBD::ScopedConnectionList bundle_connections;
};
class NameChannelDialog : public ArdourDialog
};
class NameChannelDialog : public ArdourDialog
@@
-131,7
+129,7
@@
public:
private:
void setup ();
private:
void setup ();
-
+
boost::shared_ptr<ARDOUR::Bundle> _bundle;
uint32_t _channel;
Gtk::Entry _name;
boost::shared_ptr<ARDOUR::Bundle> _bundle;
uint32_t _channel;
Gtk::Entry _name;