projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
if user has edited name entry in add route dialog, type changes should not reset it.
[ardour.git]
/
gtk2_ardour
/
add_route_dialog.h
diff --git
a/gtk2_ardour/add_route_dialog.h
b/gtk2_ardour/add_route_dialog.h
index 05be01ef3d02953f8a1ed4626565d5be86009c46..718df8842d76ed5756a6ec4b0b670629344869f1 100644
(file)
--- a/
gtk2_ardour/add_route_dialog.h
+++ b/
gtk2_ardour/add_route_dialog.h
@@
-40,21
+40,29
@@
#include "ardour_dialog.h"
#include "instrument_selector.h"
#include "ardour_dialog.h"
#include "instrument_selector.h"
+#include "route_dialogs.h"
class Editor;
class Editor;
+class RouteGroupDialog;
class AddRouteDialog : public ArdourDialog
{
class AddRouteDialog : public ArdourDialog
{
-
public:
+public:
AddRouteDialog ();
~AddRouteDialog ();
AddRouteDialog ();
~AddRouteDialog ();
+ enum ResponseId {
+ Add,
+ AddAndClose,
+ };
+
enum TypeWanted {
AudioTrack,
MidiTrack,
MixedTrack,
AudioBus,
enum TypeWanted {
AudioTrack,
MidiTrack,
MixedTrack,
AudioBus,
- MidiBus
+ MidiBus,
+ VCAMaster,
};
TypeWanted type_wanted() const;
};
TypeWanted type_wanted() const;
@@
-68,17
+76,11
@@
class AddRouteDialog : public ArdourDialog
ARDOUR::TrackMode mode();
ARDOUR::RouteGroup* route_group ();
ARDOUR::TrackMode mode();
ARDOUR::RouteGroup* route_group ();
- enum InsertAt {
- BeforeSelection,
- AfterSelection,
- First,
- Last
- };
- InsertAt insert_at();
- bool use_strict_io() { return strict_io.get_active (); }
+ RouteDialogs::InsertAt insert_at();
+ bool use_strict_io();
-
private:
+private:
Gtk::Entry name_template_entry;
Gtk::ComboBoxText track_bus_combo;
Gtk::Adjustment routes_adjustment;
Gtk::Entry name_template_entry;
Gtk::ComboBoxText track_bus_combo;
Gtk::Adjustment routes_adjustment;
@@
-90,9
+92,8
@@
class AddRouteDialog : public ArdourDialog
Gtk::ComboBoxText mode_combo;
Gtk::ComboBoxText route_group_combo;
InstrumentSelector instrument_combo;
Gtk::ComboBoxText mode_combo;
Gtk::ComboBoxText route_group_combo;
InstrumentSelector instrument_combo;
- Gtk::Label insert_at_label;
Gtk::ComboBoxText insert_at_combo;
Gtk::ComboBoxText insert_at_combo;
- Gtk::C
heckButton strict_i
o;
+ Gtk::C
omboBoxText strict_io_comb
o;
std::vector<ARDOUR::TemplateInfo> route_templates;
std::vector<ARDOUR::TemplateInfo> route_templates;
@@
-108,13
+109,14
@@
class AddRouteDialog : public ArdourDialog
void maybe_update_name_template_entry ();
void reset_template_option_visibility ();
void maybe_update_name_template_entry ();
void reset_template_option_visibility ();
-
+ void new_group_dialog_finished (int, RouteGroupDialog*);
void on_show ();
void on_show ();
+ void on_response (int);
struct ChannelSetup {
struct ChannelSetup {
- std::string name;
- std::string template_path;
- uint32_t channels;
+
std::string name;
+
std::string template_path;
+
uint32_t channels;
};
typedef std::vector<ChannelSetup> ChannelSetups;
};
typedef std::vector<ChannelSetup> ChannelSetups;
@@
-122,6
+124,10
@@
class AddRouteDialog : public ArdourDialog
static std::vector<std::string> channel_combo_strings;
static std::vector<std::string> bus_mode_strings;
static std::vector<std::string> channel_combo_strings;
static std::vector<std::string> bus_mode_strings;
+
+ bool name_edited_by_user;
+ void name_template_entry_insertion (Glib::ustring const &,int*);
+ void name_template_entry_deletion (int, int);
};
#endif /* __gtk_ardour_add_route_dialog_h__ */
};
#endif /* __gtk_ardour_add_route_dialog_h__ */