[SCM] ardour Debian packaging branch, master, updated. upstream/2.8.2-103-gaca491e
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Mon Oct 12 20:37:24 UTC 2009
The following commit has been merged in the master branch:
commit 59b6492d66d5c5d2b8a9c916d43f246e5295e2b8
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Thu Oct 8 18:11:42 2009 +0200
Update ardour-xchange.patch to 2.8.3
diff --git a/debian/patches/90_ardour-x-change.patch b/debian/patches/90_ardour-x-change.patch
index a11edb4..b2c9ef1 100644
--- a/debian/patches/90_ardour-x-change.patch
+++ b/debian/patches/90_ardour-x-change.patch
@@ -1,8 +1,8 @@
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
-index 2e7beab..4a12488 100644
+index 8aaffc0..78dab10 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
-@@ -179,6 +179,7 @@ imageframe_time_axis.cc
+@@ -178,6 +178,7 @@ imageframe_time_axis.cc
imageframe_time_axis_group.cc
imageframe_time_axis_view.cc
imageframe_view.cc
@@ -1493,7 +1493,7 @@ index 0000000..37d8257
+
+#endif // IMPORT_HELPER_AAF_H
diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
-index c02d9b1..d7c79cc 100644
+index 0fecaf3..72ddf5a 100644
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -1,5 +1,5 @@
@@ -1516,7 +1516,7 @@ index c02d9b1..d7c79cc 100644
NewSessionDialog::NewSessionDialog()
: ArdourDialog ("session control")
{
-@@ -81,17 +87,15 @@ NewSessionDialog::NewSessionDialog()
+@@ -82,17 +88,15 @@ NewSessionDialog::NewSessionDialog()
session_template_label = new Gtk::Label(_("Template :"));
m_template = new Gtk::FileChooserButton();
m_create_control_bus = new Gtk::CheckButton(_("Create Monitor Bus"));
@@ -1535,7 +1535,7 @@ index c02d9b1..d7c79cc 100644
Gtk::Adjustment *m_input_limit_count_adj = Gtk::manage(new Gtk::Adjustment(1, 0, 100, 1, 10));
m_input_limit_count = new Gtk::SpinButton(*m_input_limit_count_adj, 1, 0);
input_port_limit_hbox = new Gtk::HBox(false, 0);
-@@ -100,16 +104,15 @@ NewSessionDialog::NewSessionDialog()
+@@ -101,16 +105,15 @@ NewSessionDialog::NewSessionDialog()
bus_frame = new Gtk::Frame();
bus_table = new Gtk::Table (2, 3, false);
@@ -1554,7 +1554,7 @@ index c02d9b1..d7c79cc 100644
Gtk::RadioButton::Group _RadioBGroup_m_connect_outputs_to_master;
m_connect_outputs_to_master = new Gtk::RadioButton(_RadioBGroup_m_connect_outputs_to_master, _("... to Master Bus"));
m_connect_outputs_to_physical = new Gtk::RadioButton(_RadioBGroup_m_connect_outputs_to_master, _("... to Physical Outputs"));
-@@ -172,7 +175,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -173,7 +176,7 @@ NewSessionDialog::NewSessionDialog()
m_create_master_bus->set_border_width(0);
advanced_table->set_row_spacings(0);
advanced_table->set_col_spacings(0);
@@ -1563,7 +1563,7 @@ index c02d9b1..d7c79cc 100644
m_connect_inputs->set_flags(Gtk::CAN_FOCUS);
m_connect_inputs->set_relief(Gtk::RELIEF_NORMAL);
m_connect_inputs->set_mode(true);
-@@ -203,7 +206,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -204,7 +207,7 @@ NewSessionDialog::NewSessionDialog()
bus_frame->set_label_align(0,0.5);
bus_frame->add(*bus_hbox);
bus_frame->set_label_widget(*bus_label);
@@ -1572,7 +1572,7 @@ index c02d9b1..d7c79cc 100644
bus_table->set_row_spacings (0);
bus_table->set_col_spacings (0);
bus_table->attach (*m_create_master_bus, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-@@ -345,12 +348,12 @@ NewSessionDialog::NewSessionDialog()
+@@ -346,12 +349,12 @@ NewSessionDialog::NewSessionDialog()
m_notebook->set_flags(Gtk::CAN_FOCUS);
m_notebook->set_scrollable(true);
@@ -1587,7 +1587,7 @@ index c02d9b1..d7c79cc 100644
icon setting is done again in the editor (for the whole app),
but its all chickens and eggs at this point.
*/
-@@ -392,7 +395,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -393,7 +396,7 @@ NewSessionDialog::NewSessionDialog()
m_treeview->get_selection()->set_mode (Gtk::SELECTION_SINGLE);
std::string path = ARDOUR::get_user_ardour_path();
@@ -1596,16 +1596,7 @@ index c02d9b1..d7c79cc 100644
if (path.empty()) {
path = ARDOUR::get_system_data_path();
}
-@@ -409,7 +412,7 @@ NewSessionDialog::NewSessionDialog()
- }
-
- const std::string sys_templates_dir = ARDOUR::get_system_data_path() + template_dir_name;
--
-+
- if (Glib::file_test(sys_templates_dir, Glib::FILE_TEST_IS_DIR))
- {
- m_template->add_shortcut_folder(sys_templates_dir);
-@@ -417,6 +420,21 @@ NewSessionDialog::NewSessionDialog()
+@@ -426,6 +429,21 @@ printf("system template path = %s\n", sys_templates_path.c_str());
m_template->set_title(_("select template"));
Gtk::FileFilter* session_filter = manage (new (Gtk::FileFilter));
@@ -1627,7 +1618,7 @@ index c02d9b1..d7c79cc 100644
session_filter->add_pattern(X_("*.ardour"));
session_filter->add_pattern(X_("*.ardour.bak"));
m_open_filechooser->set_filter (*session_filter);
-@@ -463,7 +481,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -472,7 +490,7 @@ printf("system template path = %s\n", sys_templates_path.c_str());
m_treeview->signal_row_activated().connect (mem_fun (*this, &NewSessionDialog::recent_row_activated));
m_open_filechooser->signal_selection_changed ().connect (mem_fun (*this, &NewSessionDialog::file_chosen));
m_template->signal_selection_changed ().connect (mem_fun (*this, &NewSessionDialog::template_chosen));
@@ -1636,7 +1627,7 @@ index c02d9b1..d7c79cc 100644
page_set = Pages (0);
}
-@@ -552,7 +570,7 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+@@ -579,7 +597,7 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
4) canonicalize_file_name() & realpath() have entirely
different semantics on OS X and Linux when given
a non-existent path.
@@ -1645,7 +1636,7 @@ index c02d9b1..d7c79cc 100644
as result of all this, we take two distinct pathways through the code.
*/
-@@ -569,7 +587,6 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+@@ -596,7 +614,6 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
engine_page_session_folder = realdir;
}
@@ -1653,8 +1644,8 @@ index c02d9b1..d7c79cc 100644
#else
char* res;
if (!Glib::file_test (dir, Glib::FILE_TEST_IS_DIR)) {
-@@ -582,7 +599,7 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
- m_folder->set_current_folder (res);
+@@ -608,7 +625,7 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+ engine_page_session_folder = res;
free (res);
}
-
@@ -1662,7 +1653,7 @@ index c02d9b1..d7c79cc 100644
#endif
}
-@@ -590,7 +607,8 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+@@ -616,7 +633,8 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
std::string
NewSessionDialog::session_name() const
{
@@ -1672,7 +1663,7 @@ index c02d9b1..d7c79cc 100644
std::string::size_type position = str.find_last_of ('/');
str = str.substr (position+1);
position = str.find_last_of ('.');
-@@ -602,7 +620,7 @@ NewSessionDialog::session_name() const
+@@ -628,7 +646,7 @@ NewSessionDialog::session_name() const
if ((position = str.rfind(".bak")) != string::npos) {
str = str.substr (0, position);
@@ -1681,8 +1672,8 @@ index c02d9b1..d7c79cc 100644
*/
switch (which_page()) {
-@@ -615,7 +633,7 @@ NewSessionDialog::session_name() const
- return Glib::filename_from_utf8(m_name->get_text());
+@@ -647,7 +665,7 @@ NewSessionDialog::session_name() const
+
default:
break;
- }
@@ -1690,15 +1681,15 @@ index c02d9b1..d7c79cc 100644
if (m_treeview->get_selection()->count_selected_rows() == 0) {
return Glib::filename_from_utf8(str);
-@@ -630,7 +648,6 @@ NewSessionDialog::session_folder() const
+@@ -663,7 +681,6 @@ NewSessionDialog::session_folder() const
switch (which_page()) {
case NewPage:
return Glib::filename_from_utf8(m_folder->get_filename());
-
case EnginePage:
- if (!(page_set & OpenPage) && !(page_set & NewPage)) {
- /* just engine page, nothing else */
-@@ -645,9 +662,9 @@ NewSessionDialog::session_folder() const
+ if (!(page_set & (OpenPage|NewPage))) {
+ return Glib::filename_from_utf8(engine_page_session_folder);
+@@ -678,9 +695,9 @@ NewSessionDialog::session_folder() const
default:
break;
}
@@ -1710,7 +1701,7 @@ index c02d9b1..d7c79cc 100644
return Glib::path_get_dirname(filename);
}
-@@ -809,7 +826,7 @@ NewSessionDialog::reset_name()
+@@ -871,7 +888,7 @@ NewSessionDialog::reset_name()
{
m_name->set_text("");
set_response_sensitive (Gtk::RESPONSE_OK, false);
@@ -1719,7 +1710,7 @@ index c02d9b1..d7c79cc 100644
}
void
-@@ -898,11 +915,57 @@ NewSessionDialog::file_chosen ()
+@@ -967,11 +984,57 @@ NewSessionDialog::file_chosen ()
}
if (!m_open_filechooser->get_filename().empty()) {
@@ -1779,7 +1770,7 @@ index c02d9b1..d7c79cc 100644
}
void
-@@ -982,61 +1045,61 @@ NewSessionDialog::reset_recent()
+@@ -1051,61 +1114,61 @@ NewSessionDialog::reset_recent()
std::vector<string *> *sessions;
std::vector<string *>::iterator i;
RecentSessionsSorter cmp;
@@ -1859,7 +1850,7 @@ index c02d9b1..d7c79cc 100644
}
}
diff --git a/gtk2_ardour/new_session_dialog.h b/gtk2_ardour/new_session_dialog.h
-index 658b2a8..dfba157 100644
+index c4495dc..f93f27e 100644
--- a/gtk2_ardour/new_session_dialog.h
+++ b/gtk2_ardour/new_session_dialog.h
@@ -1,5 +1,5 @@
@@ -1927,10 +1918,10 @@ index 658b2a8..dfba157 100644
bool have_engine;
Glib::ustring engine_page_session_folder;
Glib::ustring engine_page_session_name;
-+ string m_filename;
- };
++ string m_filename;
- #endif // NEW_SESSION_DIALOG_H
+ sigc::connection ic_connection;
+ void engine_interface_chosen();
diff --git a/libs/ardour/ardour/ax_errors.h b/libs/ardour/ardour/ax_errors.h
new file mode 100644
index 0000000..ca3d396
--
ardour Debian packaging
More information about the pkg-multimedia-commits
mailing list