mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-19 05:06:31 +01:00
merge 12717:12954 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12955 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
f1fd9c7bdc
commit
6e824e7797
174 changed files with 2923 additions and 2899 deletions
|
|
@ -110,6 +110,8 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
|
|||
void change_compatibility (bool compatibility, boost::weak_ptr<T> w_ptr, Glib::RefPtr<Gtk::ListStore> & list, ColsT & cols,
|
||||
std::string const & c_incompatible = "red", std::string const & c_compatible = "white");
|
||||
|
||||
void update_description();
|
||||
|
||||
uint32_t applying_changes_from_engine;
|
||||
|
||||
/*** Non-interactive selections ***/
|
||||
|
|
@ -151,6 +153,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
|
|||
|
||||
Gtk::Label name_label;
|
||||
Gtk::Entry name_entry;
|
||||
Gtk::Label name_generated_part;
|
||||
|
||||
/* Normalize */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue