allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

minor new session dialog glade fixes

Browse Source 
git-svn-id: svn://localhost/trunk/ardour2@134 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry
2005-11-28 05:04:14 +00:00
parent 1184029638
commit 8cfbdaae19
5 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/ardour_ui.cc
View File

@@ -2670,13 +2670,13 @@ ARDOUR_UI::new_session (bool startup, std::string predetermined_path)
Session::AutoConnectOption iconnect;
Session::AutoConnectOption oconnect;
if (m_new_session_dialog->create_control_track()) {
if (m_new_session_dialog->create_control_bus()) {
cchns = (uint32_t) m_new_session_dialog->control_channel_count();
} else {
cchns = 0;
}
if (m_new_session_dialog->create_master_track()) {
if (m_new_session_dialog->create_master_bus()) {
mchns = (uint32_t) m_new_session_dialog->master_channel_count();
} else {
mchns = 0;

2
gtk2_ardour/glade_factory.cc
View File

@@ -26,7 +26,7 @@ Glib::RefPtr<Gnome::Glade::Xml>
GladeFactory::create(const std::string& full_path_to_file,
const Glib::ustring& toplevel_widget)
{
try {
try {
return Gnome::Glade::Xml::create(full_path_to_file,
toplevel_widget,
PACKAGE );

4
gtk2_ardour/glade_path.cc
View File

@@ -41,9 +41,5 @@ GladePath::path(const std::string& glade_file)
full_path = ARDOUR::find_data_file(Glib::build_filename("glade",
glade_file));
// temporary debugging
std::cerr << "Path to glade file" << full_path << std::endl;
return full_path;
}

22
gtk2_ardour/new_session_dialog.cc
View File

@@ -22,7 +22,7 @@
#include "new_session_dialog.h"
#include "glade_path.h"
const char* NewSessionDialogFactory::s_m_top_level_widget_name = X_("new_session_dialog");
const char* NewSessionDialogFactory::s_m_top_level_widget_name = X_("NewSessionDialog");
const char* NewSessionDialogFactory::top_level_widget_name() { return s_m_top_level_widget_name; }
Glib::RefPtr<Gnome::Glade::Xml>
@@ -42,11 +42,11 @@ NewSessionDialog::NewSessionDialog(BaseObjectType* cobject,
xml->get_widget(X_("SessionFolderChooser"), m_folder);
xml->get_widget(X_("SessionTemplateChooser"), m_template);
xml->get_widget(X_("CreateMasterBus"), m_create_master_track);
xml->get_widget(X_("MasterChannelCount"), m_master_track_channel_count);
xml->get_widget(X_("CreateMasterBus"), m_create_master_bus);
xml->get_widget(X_("MasterChannelCount"), m_master_bus_channel_count);
xml->get_widget(X_("CreateControlBus"), m_create_control_track);
xml->get_widget(X_("ControlChannelCount"), m_control_track_channel_count);
xml->get_widget(X_("CreateControlBus"), m_create_control_bus);
xml->get_widget(X_("ControlChannelCount"), m_control_bus_channel_count);
xml->get_widget(X_("ConnectInputs"), m_connect_inputs);
xml->get_widget(X_("LimitInputPorts"), m_limit_input_ports);
@@ -94,27 +94,27 @@ NewSessionDialog::session_template_name() const
}
bool
NewSessionDialog::create_master_track() const
NewSessionDialog::create_master_bus() const
{
return m_create_master_track->get_active();
return m_create_master_bus->get_active();
}
int
NewSessionDialog::master_channel_count() const
{
return m_master_track_channel_count->get_value_as_int();
return m_master_bus_channel_count->get_value_as_int();
}
bool
NewSessionDialog::create_control_track() const
NewSessionDialog::create_control_bus() const
{
return m_create_control_track->get_active();
return m_create_control_bus->get_active();
}
int
NewSessionDialog::control_channel_count() const
{
return m_control_track_channel_count->get_value_as_int();
return m_control_bus_channel_count->get_value_as_int();
}
bool

14
gtk2_ardour/new_session_dialog.h
View File

@@ -57,10 +57,10 @@ public:
// advanced.
bool create_master_track() const;
int master_channel_count() const;
bool create_master_bus() const;
int master_channel_count() const;
bool create_control_track() const;
bool create_control_bus() const;
int control_channel_count() const;
bool connect_inputs() const;
@@ -88,11 +88,11 @@ protected:
Gtk::FileChooserButton* m_folder;
Gtk::FileChooserButton* m_template;
Gtk::CheckButton* m_create_master_track;
Gtk::SpinButton* m_master_track_channel_count;
Gtk::CheckButton* m_create_master_bus;
Gtk::SpinButton* m_master_bus_channel_count;
Gtk::CheckButton* m_create_control_track;
Gtk::SpinButton* m_control_track_channel_count;
Gtk::CheckButton* m_create_control_bus;
Gtk::SpinButton* m_control_bus_channel_count;
Gtk::CheckButton* m_connect_inputs;
Gtk::CheckButton* m_limit_input_ports;