[SCM] ardour/master: Refresh 90_ardour-x-change.patch
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Sat Aug 11 20:45:42 UTC 2012
The following commit has been merged in the master branch:
commit 1576a422c284b93c60ee2b29de0cbb41b0d3b8da
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Sat Aug 11 20:51:46 2012 +0200
Refresh 90_ardour-x-change.patch
diff --git a/debian/patches/90_ardour-x-change.patch b/debian/patches/90_ardour-x-change.patch
index 46d13ce..e5bd43a 100644
--- a/debian/patches/90_ardour-x-change.patch
+++ b/debian/patches/90_ardour-x-change.patch
@@ -1,7 +1,5 @@
-Index: ardour/gtk2_ardour/SConscript
-===================================================================
---- ardour.orig/gtk2_ardour/SConscript 2011-10-04 00:17:40.536136197 +0200
-+++ ardour/gtk2_ardour/SConscript 2011-10-04 00:34:47.734256071 +0200
+--- a/gtk2_ardour/SConscript
++++ b/gtk2_ardour/SConscript
@@ -178,6 +178,7 @@
imageframe_time_axis_group.cc
imageframe_time_axis_view.cc
@@ -10,10 +8,8 @@ Index: ardour/gtk2_ardour/SConscript
io_selector.cc
keyboard.cc
keyeditor.cc
-Index: ardour/gtk2_ardour/import_helper_aaf.cc
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ardour/gtk2_ardour/import_helper_aaf.cc 2011-10-04 00:34:47.734256071 +0200
+--- /dev/null
++++ b/gtk2_ardour/import_helper_aaf.cc
@@ -0,0 +1,1389 @@
+/*
+ Copyright (C) 2005 Paul Davis
@@ -1404,10 +1400,8 @@ Index: ardour/gtk2_ardour/import_helper_aaf.cc
+/***************************************************************
+* *
+****************************************************************/
-Index: ardour/gtk2_ardour/import_helper_aaf.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ardour/gtk2_ardour/import_helper_aaf.h 2011-10-04 00:34:47.734256071 +0200
+--- /dev/null
++++ b/gtk2_ardour/import_helper_aaf.h
@@ -0,0 +1,81 @@
+/*
+ Copyright (C) 2005 Paul Davis
@@ -1490,10 +1484,8 @@ Index: ardour/gtk2_ardour/import_helper_aaf.h
+}
+
+#endif // IMPORT_HELPER_AAF_H
-Index: ardour/gtk2_ardour/new_session_dialog.cc
-===================================================================
---- ardour.orig/gtk2_ardour/new_session_dialog.cc 2011-10-04 00:17:40.608134102 +0200
-+++ ardour/gtk2_ardour/new_session_dialog.cc 2011-10-04 00:34:47.738255955 +0200
+--- a/gtk2_ardour/new_session_dialog.cc
++++ b/gtk2_ardour/new_session_dialog.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2005 Paul Davis
@@ -1501,7 +1493,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
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 @@
+@@ -45,6 +45,12 @@
#include "i18n.h"
#include "new_session_dialog.h"
@@ -1514,7 +1506,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
NewSessionDialog::NewSessionDialog()
: ArdourDialog ("session control")
{
-@@ -82,17 +88,15 @@
+@@ -84,17 +90,15 @@
session_template_label = new Gtk::Label(_("Template :"));
m_template = new Gtk::FileChooserButton();
m_create_control_bus = new Gtk::CheckButton(_("Create Monitor Bus"));
@@ -1533,7 +1525,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
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 @@
+@@ -103,16 +107,15 @@
bus_frame = new Gtk::Frame();
bus_table = new Gtk::Table (2, 3, false);
@@ -1552,7 +1544,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
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 @@
+@@ -175,7 +178,7 @@
m_create_master_bus->set_border_width(0);
advanced_table->set_row_spacings(0);
advanced_table->set_col_spacings(0);
@@ -1561,7 +1553,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
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 @@
+@@ -206,7 +209,7 @@
bus_frame->set_label_align(0,0.5);
bus_frame->add(*bus_hbox);
bus_frame->set_label_widget(*bus_label);
@@ -1570,7 +1562,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
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 @@
+@@ -348,12 +351,12 @@
m_notebook->set_flags(Gtk::CAN_FOCUS);
m_notebook->set_scrollable(true);
@@ -1585,7 +1577,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
icon setting is done again in the editor (for the whole app),
but its all chickens and eggs at this point.
*/
-@@ -391,7 +394,7 @@
+@@ -393,7 +396,7 @@
m_treeview->get_selection()->set_mode (Gtk::SELECTION_SINGLE);
std::string path = ARDOUR::get_user_ardour_path();
@@ -1594,7 +1586,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
if (path.empty()) {
path = ARDOUR::get_system_data_path();
}
-@@ -424,6 +427,21 @@
+@@ -426,6 +429,21 @@
m_template->set_title(_("select template"));
Gtk::FileFilter* session_filter = manage (new (Gtk::FileFilter));
@@ -1616,7 +1608,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
session_filter->add_pattern(X_("*.ardour"));
session_filter->add_pattern(X_("*.ardour.bak"));
m_open_filechooser->set_filter (*session_filter);
-@@ -475,7 +493,7 @@
+@@ -477,7 +495,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));
@@ -1625,7 +1617,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
page_set = Pages (0);
}
-@@ -582,7 +600,7 @@
+@@ -584,7 +602,7 @@
4) canonicalize_file_name() & realpath() have entirely
different semantics on OS X and Linux when given
a non-existent path.
@@ -1634,7 +1626,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
as result of all this, we take two distinct pathways through the code.
*/
-@@ -599,7 +617,6 @@
+@@ -601,7 +619,6 @@
engine_page_session_folder = realdir;
}
@@ -1642,7 +1634,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
#else
char* res;
if (!Glib::file_test (dir, Glib::FILE_TEST_IS_DIR)) {
-@@ -611,7 +628,7 @@
+@@ -613,7 +630,7 @@
engine_page_session_folder = res;
free (res);
}
@@ -1651,7 +1643,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
#endif
}
-@@ -619,7 +636,7 @@
+@@ -621,7 +638,7 @@
std::string
NewSessionDialog::session_name() const
{
@@ -1660,7 +1652,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
std::string::size_type position = str.find_last_of (G_DIR_SEPARATOR);
str = str.substr (position+1);
position = str.find_last_of ('.');
-@@ -631,7 +648,7 @@
+@@ -633,7 +650,7 @@
if ((position = str.rfind(".bak")) != string::npos) {
str = str.substr (0, position);
@@ -1669,7 +1661,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
*/
switch (which_page()) {
-@@ -650,7 +667,7 @@
+@@ -652,7 +669,7 @@
default:
break;
@@ -1678,7 +1670,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
if (m_treeview->get_selection()->count_selected_rows() == 0) {
return Glib::filename_from_utf8(str);
-@@ -666,7 +683,6 @@
+@@ -668,7 +685,6 @@
switch (which_page()) {
case NewPage:
return Glib::filename_from_utf8(m_folder->get_filename());
@@ -1686,7 +1678,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
case EnginePage:
if (!(page_set & (OpenPage|NewPage))) {
return Glib::filename_from_utf8(engine_page_session_folder);
-@@ -681,9 +697,9 @@
+@@ -683,9 +699,9 @@
default:
break;
}
@@ -1698,7 +1690,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
return Glib::path_get_dirname(filename);
}
-@@ -874,7 +890,7 @@
+@@ -876,7 +892,7 @@
{
m_name->set_text("");
set_response_sensitive (Gtk::RESPONSE_OK, false);
@@ -1707,7 +1699,7 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
}
void
-@@ -970,11 +986,57 @@
+@@ -972,11 +988,57 @@
}
if (!m_open_filechooser->get_filename().empty()) {
@@ -1767,10 +1759,8 @@ Index: ardour/gtk2_ardour/new_session_dialog.cc
}
void
-Index: ardour/gtk2_ardour/new_session_dialog.h
-===================================================================
---- ardour.orig/gtk2_ardour/new_session_dialog.h 2011-10-04 00:17:40.608134102 +0200
-+++ ardour/gtk2_ardour/new_session_dialog.h 2011-10-04 00:38:03.312566903 +0200
+--- a/gtk2_ardour/new_session_dialog.h
++++ b/gtk2_ardour/new_session_dialog.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2005 Paul Davis
@@ -1840,10 +1830,8 @@ Index: ardour/gtk2_ardour/new_session_dialog.h
sigc::connection ic_connection;
void engine_interface_chosen();
-Index: ardour/libs/ardour/ardour/ax_errors.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ardour/libs/ardour/ardour/ax_errors.h 2011-10-04 00:34:47.738255955 +0200
+--- /dev/null
++++ b/libs/ardour/ardour/ax_errors.h
@@ -0,0 +1,40 @@
+/* ax_errors.h
+
--
ardour Debian packaging
More information about the pkg-multimedia-commits
mailing list