[SCM] ardour Debian packaging branch, master, updated. debian/2.8.7-1-8-gc6fda09
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Thu Jun 3 07:46:26 UTC 2010
The following commit has been merged in the master branch:
commit 5a742924a914160c1bb1e06734174b38e61400d4
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Tue Jun 1 20:58:12 2010 +0200
Refresh ardour-x-change.patch
diff --git a/debian/patches/90_ardour-x-change.patch b/debian/patches/90_ardour-x-change.patch
index b2c9ef1..cd18833 100644
--- a/debian/patches/90_ardour-x-change.patch
+++ b/debian/patches/90_ardour-x-change.patch
@@ -1,8 +1,6 @@
-diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
-index 8aaffc0..78dab10 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
-@@ -178,6 +178,7 @@ imageframe_time_axis.cc
+@@ -178,6 +178,7 @@
imageframe_time_axis_group.cc
imageframe_time_axis_view.cc
imageframe_view.cc
@@ -10,9 +8,6 @@ index 8aaffc0..78dab10 100644
io_selector.cc
keyboard.cc
keyeditor.cc
-diff --git a/gtk2_ardour/import_helper_aaf.cc b/gtk2_ardour/import_helper_aaf.cc
-new file mode 100644
-index 0000000..cb6b644
--- /dev/null
+++ b/gtk2_ardour/import_helper_aaf.cc
@@ -0,0 +1,1389 @@
@@ -1405,9 +1400,6 @@ index 0000000..cb6b644
+/***************************************************************
+* *
+****************************************************************/
-diff --git a/gtk2_ardour/import_helper_aaf.h b/gtk2_ardour/import_helper_aaf.h
-new file mode 100644
-index 0000000..37d8257
--- /dev/null
+++ b/gtk2_ardour/import_helper_aaf.h
@@ -0,0 +1,81 @@
@@ -1492,8 +1484,6 @@ 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 0fecaf3..72ddf5a 100644
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -1,5 +1,5 @@
@@ -1503,7 +1493,7 @@ index 0fecaf3..72ddf5a 100644
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
-@@ -43,6 +43,12 @@ using namespace PBD;
+@@ -43,6 +43,12 @@
#include "i18n.h"
#include "new_session_dialog.h"
@@ -1516,7 +1506,7 @@ index 0fecaf3..72ddf5a 100644
NewSessionDialog::NewSessionDialog()
: ArdourDialog ("session control")
{
-@@ -82,17 +88,15 @@ NewSessionDialog::NewSessionDialog()
+@@ -82,17 +88,15 @@
session_template_label = new Gtk::Label(_("Template :"));
m_template = new Gtk::FileChooserButton();
m_create_control_bus = new Gtk::CheckButton(_("Create Monitor Bus"));
@@ -1535,7 +1525,7 @@ index 0fecaf3..72ddf5a 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);
-@@ -101,16 +105,15 @@ NewSessionDialog::NewSessionDialog()
+@@ -101,16 +105,15 @@
bus_frame = new Gtk::Frame();
bus_table = new Gtk::Table (2, 3, false);
@@ -1554,7 +1544,7 @@ index 0fecaf3..72ddf5a 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"));
-@@ -173,7 +176,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -173,7 +176,7 @@
m_create_master_bus->set_border_width(0);
advanced_table->set_row_spacings(0);
advanced_table->set_col_spacings(0);
@@ -1563,7 +1553,7 @@ index 0fecaf3..72ddf5a 100644
m_connect_inputs->set_flags(Gtk::CAN_FOCUS);
m_connect_inputs->set_relief(Gtk::RELIEF_NORMAL);
m_connect_inputs->set_mode(true);
-@@ -204,7 +207,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -204,7 +207,7 @@
bus_frame->set_label_align(0,0.5);
bus_frame->add(*bus_hbox);
bus_frame->set_label_widget(*bus_label);
@@ -1572,7 +1562,7 @@ index 0fecaf3..72ddf5a 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);
-@@ -346,12 +349,12 @@ NewSessionDialog::NewSessionDialog()
+@@ -346,12 +349,12 @@
m_notebook->set_flags(Gtk::CAN_FOCUS);
m_notebook->set_scrollable(true);
@@ -1587,7 +1577,7 @@ index 0fecaf3..72ddf5a 100644
icon setting is done again in the editor (for the whole app),
but its all chickens and eggs at this point.
*/
-@@ -393,7 +396,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -391,7 +394,7 @@
m_treeview->get_selection()->set_mode (Gtk::SELECTION_SINGLE);
std::string path = ARDOUR::get_user_ardour_path();
@@ -1596,7 +1586,7 @@ index 0fecaf3..72ddf5a 100644
if (path.empty()) {
path = ARDOUR::get_system_data_path();
}
-@@ -426,6 +429,21 @@ printf("system template path = %s\n", sys_templates_path.c_str());
+@@ -424,6 +427,21 @@
m_template->set_title(_("select template"));
Gtk::FileFilter* session_filter = manage (new (Gtk::FileFilter));
@@ -1618,7 +1608,7 @@ index 0fecaf3..72ddf5a 100644
session_filter->add_pattern(X_("*.ardour"));
session_filter->add_pattern(X_("*.ardour.bak"));
m_open_filechooser->set_filter (*session_filter);
-@@ -472,7 +490,7 @@ printf("system template path = %s\n", sys_templates_path.c_str());
+@@ -475,7 +493,7 @@
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));
@@ -1627,7 +1617,7 @@ index 0fecaf3..72ddf5a 100644
page_set = Pages (0);
}
-@@ -579,7 +597,7 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+@@ -582,7 +600,7 @@
4) canonicalize_file_name() & realpath() have entirely
different semantics on OS X and Linux when given
a non-existent path.
@@ -1636,7 +1626,7 @@ index 0fecaf3..72ddf5a 100644
as result of all this, we take two distinct pathways through the code.
*/
-@@ -596,7 +614,6 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+@@ -599,7 +617,6 @@
engine_page_session_folder = realdir;
}
@@ -1644,7 +1634,7 @@ index 0fecaf3..72ddf5a 100644
#else
char* res;
if (!Glib::file_test (dir, Glib::FILE_TEST_IS_DIR)) {
-@@ -608,7 +625,7 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+@@ -611,7 +628,7 @@
engine_page_session_folder = res;
free (res);
}
@@ -1653,17 +1643,16 @@ index 0fecaf3..72ddf5a 100644
#endif
}
-@@ -616,7 +633,8 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+@@ -619,7 +636,7 @@
std::string
NewSessionDialog::session_name() const
{
-- std::string str = Glib::filename_from_utf8(m_open_filechooser->get_filename());
+- std::string str = Glib::filename_from_utf8 (m_open_filechooser->get_filename());
+ std::string str = m_filename;
-+
- std::string::size_type position = str.find_last_of ('/');
+ std::string::size_type position = str.find_last_of (G_DIR_SEPARATOR);
str = str.substr (position+1);
position = str.find_last_of ('.');
-@@ -628,7 +646,7 @@ NewSessionDialog::session_name() const
+@@ -631,7 +648,7 @@
if ((position = str.rfind(".bak")) != string::npos) {
str = str.substr (0, position);
@@ -1672,7 +1661,7 @@ index 0fecaf3..72ddf5a 100644
*/
switch (which_page()) {
-@@ -647,7 +665,7 @@ NewSessionDialog::session_name() const
+@@ -650,7 +667,7 @@
default:
break;
@@ -1681,7 +1670,7 @@ index 0fecaf3..72ddf5a 100644
if (m_treeview->get_selection()->count_selected_rows() == 0) {
return Glib::filename_from_utf8(str);
-@@ -663,7 +681,6 @@ NewSessionDialog::session_folder() const
+@@ -666,7 +683,6 @@
switch (which_page()) {
case NewPage:
return Glib::filename_from_utf8(m_folder->get_filename());
@@ -1689,7 +1678,7 @@ index 0fecaf3..72ddf5a 100644
case EnginePage:
if (!(page_set & (OpenPage|NewPage))) {
return Glib::filename_from_utf8(engine_page_session_folder);
-@@ -678,9 +695,9 @@ NewSessionDialog::session_folder() const
+@@ -681,9 +697,9 @@
default:
break;
}
@@ -1701,7 +1690,7 @@ index 0fecaf3..72ddf5a 100644
return Glib::path_get_dirname(filename);
}
-@@ -871,7 +888,7 @@ NewSessionDialog::reset_name()
+@@ -874,7 +890,7 @@
{
m_name->set_text("");
set_response_sensitive (Gtk::RESPONSE_OK, false);
@@ -1710,7 +1699,7 @@ index 0fecaf3..72ddf5a 100644
}
void
-@@ -967,11 +984,57 @@ NewSessionDialog::file_chosen ()
+@@ -970,11 +986,57 @@
}
if (!m_open_filechooser->get_filename().empty()) {
@@ -1770,87 +1759,6 @@ index 0fecaf3..72ddf5a 100644
}
void
-@@ -1051,61 +1114,61 @@ NewSessionDialog::reset_recent()
- std::vector<string *> *sessions;
- std::vector<string *>::iterator i;
- RecentSessionsSorter cmp;
--
-+
- recent_model->clear ();
-
- ARDOUR::RecentSessions rs;
- ARDOUR::read_recent_sessions (rs);
--
-+
- /* sort them alphabetically */
- sort (rs.begin(), rs.end(), cmp);
- sessions = new std::vector<std::string*>;
--
-+
- for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
- sessions->push_back (new string ((*i).second));
- }
--
-+
- for (i = sessions->begin(); i != sessions->end(); ++i) {
-
- std::vector<std::string*>* states;
- std::vector<const gchar*> item;
- std::string fullpath = *(*i);
--
-+
- /* remove any trailing / */
--
-+
- if (fullpath[fullpath.length()-1] == '/') {
- fullpath = fullpath.substr (0, fullpath.length()-1);
- }
--
-+
- /* check whether session still exists */
- if (!Glib::file_test(fullpath, Glib::FILE_TEST_EXISTS)) {
- /* session doesn't exist */
- continue;
-- }
--
-+ }
-+
- /* now get available states for this session */
--
-+
- if ((states = ARDOUR::Session::possible_states (fullpath)) == 0) {
- /* no state file? */
- continue;
- }
--
-+
- Gtk::TreeModel::Row row = *(recent_model->append());
--
-+
- row[recent_columns.visible_name] = Glib::path_get_basename (fullpath);
- row[recent_columns.fullpath] = fullpath;
--
-+
- if (states->size()) {
--
-+
- /* add the children */
--
-+
- for (std::vector<std::string*>::iterator i2 = states->begin(); i2 != states->end(); ++i2) {
-
- Gtk::TreeModel::Row child_row = *(recent_model->append (row.children()));
--
-+
- child_row[recent_columns.visible_name] = **i2;
- child_row[recent_columns.fullpath] = fullpath;
--
-+
- delete *i2;
- }
- }
-diff --git a/gtk2_ardour/new_session_dialog.h b/gtk2_ardour/new_session_dialog.h
-index c4495dc..f93f27e 100644
--- a/gtk2_ardour/new_session_dialog.h
+++ b/gtk2_ardour/new_session_dialog.h
@@ -1,5 +1,5 @@
@@ -1860,7 +1768,7 @@ index c4495dc..f93f27e 100644
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
-@@ -53,7 +53,7 @@ namespace Gtk {
+@@ -53,7 +53,7 @@
class NewSessionDialog : public ArdourDialog
{
public:
@@ -1869,7 +1777,7 @@ index c4495dc..f93f27e 100644
enum Pages {
NewPage = 0x1,
OpenPage = 0x2,
-@@ -70,7 +70,7 @@ public:
+@@ -70,7 +70,7 @@
std::string session_name() const;
std::string session_folder() const;
@@ -1878,7 +1786,7 @@ index c4495dc..f93f27e 100644
bool use_session_template() const;
std::string session_template_name() const;
-@@ -109,7 +109,7 @@ protected:
+@@ -109,7 +109,7 @@
void reset_name();
void reset_template();
@@ -1887,7 +1795,7 @@ index c4495dc..f93f27e 100644
Gtk::Label * session_name_label;
Gtk::Label * session_location_label;
Gtk::Label * session_template_label;
-@@ -155,7 +155,7 @@ protected:
+@@ -155,7 +155,7 @@
Gtk::CheckButton* m_create_master_bus;
Gtk::SpinButton* m_master_bus_channel_count;
@@ -1896,7 +1804,7 @@ index c4495dc..f93f27e 100644
Gtk::CheckButton* m_create_control_bus;
Gtk::SpinButton* m_control_bus_channel_count;
-@@ -163,7 +163,7 @@ protected:
+@@ -163,7 +163,7 @@
Gtk::CheckButton* m_limit_input_ports;
Gtk::SpinButton* m_input_limit_count;
@@ -1905,7 +1813,7 @@ index c4495dc..f93f27e 100644
Gtk::CheckButton* m_limit_output_ports;
Gtk::SpinButton* m_output_limit_count;
-@@ -180,7 +180,7 @@ protected:
+@@ -180,7 +180,7 @@
Pages page_set;
struct RecentSessionModelColumns : public Gtk::TreeModel::ColumnRecord {
@@ -1914,7 +1822,7 @@ index c4495dc..f93f27e 100644
add (visible_name);
add (fullpath);
}
-@@ -217,6 +217,7 @@ protected:
+@@ -217,6 +217,7 @@
bool have_engine;
Glib::ustring engine_page_session_folder;
Glib::ustring engine_page_session_name;
@@ -1922,9 +1830,6 @@ index c4495dc..f93f27e 100644
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
--- /dev/null
+++ b/libs/ardour/ardour/ax_errors.h
@@ -0,0 +1,40 @@
--
ardour Debian packaging
More information about the pkg-multimedia-commits
mailing list