[SCM] ardour Debian packaging branch, master, updated. upstream/2.8-73-gb177712
freee at users.alioth.debian.org
freee at users.alioth.debian.org
Wed Jul 22 16:54:51 UTC 2009
The following commit has been merged in the master branch:
commit 4def32dc303f1cee23772e47a430cf0f6c23fd6f
Author: Free Ekanayaka <free at 64studio.com>
Date: Sun Apr 19 18:37:09 2009 +0200
Updated ardourino and ardour-x-change patches
diff --git a/debian/patches/80_ardourino.patch b/debian/patches/80_ardourino.patch
index 105295c..6359277 100644
--- a/debian/patches/80_ardourino.patch
+++ b/debian/patches/80_ardourino.patch
@@ -1,5 +1,5 @@
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
-index f721953..9834483 100644
+index 7287e6f..2ebd14d 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -57,6 +57,7 @@
@@ -10,7 +10,7 @@ index f721953..9834483 100644
#include "i18n.h"
-@@ -202,10 +203,11 @@ MixerStrip::init ()
+@@ -211,10 +212,11 @@ MixerStrip::init ()
group_button.set_name ("MixerGroupButton");
group_label.set_name ("MixerGroupButtonLabel");
@@ -25,7 +25,7 @@ index f721953..9834483 100644
global_vpacker.set_border_width (0);
global_vpacker.set_spacing (0);
-@@ -233,10 +235,16 @@ MixerStrip::init ()
+@@ -242,10 +244,16 @@ MixerStrip::init ()
global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
global_vpacker.pack_start (*gain_meter_alignment,Gtk::PACK_SHRINK);
global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
@@ -45,7 +45,7 @@ index f721953..9834483 100644
global_frame.add (global_vpacker);
global_frame.set_shadow_type (Gtk::SHADOW_IN);
-@@ -419,7 +427,10 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
+@@ -428,7 +436,10 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
/* now force an update of all the various elements */
pre_redirect_box.update();
@@ -57,7 +57,7 @@ index f721953..9834483 100644
mute_changed (0);
solo_changed (0);
name_changed (0);
-@@ -428,7 +439,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
+@@ -437,7 +448,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
connect_to_pan ();
@@ -68,7 +68,7 @@ index f721953..9834483 100644
if (is_audio_track()) {
speed_changed ();
-@@ -470,10 +483,13 @@ MixerStrip::set_width (Width w, void* owner)
+@@ -479,10 +492,13 @@ MixerStrip::set_width (Width w, void* owner)
/* always set the gpm width again, things may be hidden */
gpm.set_width (w);
@@ -85,7 +85,7 @@ index f721953..9834483 100644
_width_owner = owner;
ensure_xml_node ();
-@@ -493,18 +509,21 @@ MixerStrip::set_width (Width w, void* owner)
+@@ -502,18 +518,21 @@ MixerStrip::set_width (Width w, void* owner)
((Gtk::Label*)mute_button->get_child())->set_text (_("Mute"));
((Gtk::Label*)solo_button->get_child())->set_text (_("Solo"));
@@ -116,7 +116,7 @@ index f721953..9834483 100644
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
set_size_request (-1, -1);
break;
-@@ -516,18 +535,21 @@ MixerStrip::set_width (Width w, void* owner)
+@@ -525,18 +544,21 @@ MixerStrip::set_width (Width w, void* owner)
((Gtk::Label*)mute_button->get_child())->set_text (_("M"));
((Gtk::Label*)solo_button->get_child())->set_text (_("S"));
@@ -147,7 +147,7 @@ index f721953..9834483 100644
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
set_size_request (max (50, gpm.get_gm_width()), -1);
break;
-@@ -787,7 +809,9 @@ MixerStrip::update_input_display ()
+@@ -796,7 +818,9 @@ MixerStrip::update_input_display ()
break;
}
}
@@ -158,7 +158,7 @@ index f721953..9834483 100644
}
void
-@@ -809,7 +833,9 @@ MixerStrip::update_output_display ()
+@@ -818,7 +842,9 @@ MixerStrip::update_output_display ()
}
gpm.setup_meters ();
@@ -169,7 +169,7 @@ index f721953..9834483 100644
}
void
-@@ -1206,13 +1232,17 @@ MixerStrip::map_frozen ()
+@@ -1214,13 +1240,17 @@ MixerStrip::map_frozen ()
if (at) {
switch (at->freeze_state()) {
case AudioTrack::Frozen:
diff --git a/debian/patches/90_ardour-x-change.patch b/debian/patches/90_ardour-x-change.patch
index a4f0934..a11edb4 100644
--- a/debian/patches/90_ardour-x-change.patch
+++ b/debian/patches/90_ardour-x-change.patch
@@ -1,5 +1,5 @@
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
-index 7e3bbe2..57a8c20 100644
+index 2e7beab..4a12488 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -179,6 +179,7 @@ imageframe_time_axis.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 2724785..c316a87 100644
+index c02d9b1..d7c79cc 100644
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -1,5 +1,5 @@
@@ -1516,28 +1516,26 @@ index 2724785..c316a87 100644
NewSessionDialog::NewSessionDialog()
: ArdourDialog ("session control")
{
-@@ -81,17 +87,17 @@ NewSessionDialog::NewSessionDialog()
+@@ -81,17 +87,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"));
-
-+
- Gtk::Adjustment *m_control_bus_channel_count_adj = Gtk::manage(new Gtk::Adjustment(2, 0, 100, 1, 10, 10));
+ Gtk::Adjustment *m_control_bus_channel_count_adj = Gtk::manage(new Gtk::Adjustment(2, 0, 100, 1, 10));
m_control_bus_channel_count = new Gtk::SpinButton(*m_control_bus_channel_count_adj, 1, 0);
-
+
- Gtk::Adjustment *m_master_bus_channel_count_adj = Gtk::manage(new Gtk::Adjustment(2, 0, 100, 1, 10, 10));
+ Gtk::Adjustment *m_master_bus_channel_count_adj = Gtk::manage(new Gtk::Adjustment(2, 0, 100, 1, 10));
m_master_bus_channel_count = new Gtk::SpinButton(*m_master_bus_channel_count_adj, 1, 0);
m_create_master_bus = new Gtk::CheckButton(_("Create Master Bus"));
advanced_table = new Gtk::Table(2, 2, true);
m_connect_inputs = new Gtk::CheckButton(_("Automatically Connect to Physical Inputs"));
m_limit_input_ports = new Gtk::CheckButton(_("Use only"));
-
-+
- Gtk::Adjustment *m_input_limit_count_adj = Gtk::manage(new Gtk::Adjustment(1, 0, 100, 1, 10, 10));
+ 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 +106,16 @@ NewSessionDialog::NewSessionDialog()
+@@ -100,16 +104,15 @@ NewSessionDialog::NewSessionDialog()
bus_frame = new Gtk::Frame();
bus_table = new Gtk::Table (2, 3, false);
@@ -1547,8 +1545,7 @@ index 2724785..c316a87 100644
m_connect_outputs = new Gtk::CheckButton(_("Automatically Connect Outputs"));
m_limit_output_ports = new Gtk::CheckButton(_("Use only"));
-
-+
- Gtk::Adjustment *m_output_limit_count_adj = Gtk::manage(new Gtk::Adjustment(1, 0, 100, 1, 10, 10));
+ Gtk::Adjustment *m_output_limit_count_adj = Gtk::manage(new Gtk::Adjustment(1, 0, 100, 1, 10));
m_output_limit_count = new Gtk::SpinButton(*m_output_limit_count_adj, 1, 0);
output_port_limit_hbox = new Gtk::HBox(false, 0);
output_port_vbox = new Gtk::VBox(false, 0);
@@ -1557,7 +1554,7 @@ index 2724785..c316a87 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 +178,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -172,7 +175,7 @@ NewSessionDialog::NewSessionDialog()
m_create_master_bus->set_border_width(0);
advanced_table->set_row_spacings(0);
advanced_table->set_col_spacings(0);
@@ -1566,7 +1563,7 @@ index 2724785..c316a87 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 +209,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -203,7 +206,7 @@ NewSessionDialog::NewSessionDialog()
bus_frame->set_label_align(0,0.5);
bus_frame->add(*bus_hbox);
bus_frame->set_label_widget(*bus_label);
@@ -1575,7 +1572,7 @@ index 2724785..c316a87 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 +351,12 @@ NewSessionDialog::NewSessionDialog()
+@@ -345,12 +348,12 @@ NewSessionDialog::NewSessionDialog()
m_notebook->set_flags(Gtk::CAN_FOCUS);
m_notebook->set_scrollable(true);
@@ -1590,7 +1587,7 @@ index 2724785..c316a87 100644
icon setting is done again in the editor (for the whole app),
but its all chickens and eggs at this point.
*/
-@@ -392,7 +398,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -392,7 +395,7 @@ NewSessionDialog::NewSessionDialog()
m_treeview->get_selection()->set_mode (Gtk::SELECTION_SINGLE);
std::string path = ARDOUR::get_user_ardour_path();
@@ -1599,7 +1596,7 @@ index 2724785..c316a87 100644
if (path.empty()) {
path = ARDOUR::get_system_data_path();
}
-@@ -409,7 +415,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -409,7 +412,7 @@ NewSessionDialog::NewSessionDialog()
}
const std::string sys_templates_dir = ARDOUR::get_system_data_path() + template_dir_name;
@@ -1608,7 +1605,7 @@ index 2724785..c316a87 100644
if (Glib::file_test(sys_templates_dir, Glib::FILE_TEST_IS_DIR))
{
m_template->add_shortcut_folder(sys_templates_dir);
-@@ -417,6 +423,21 @@ NewSessionDialog::NewSessionDialog()
+@@ -417,6 +420,21 @@ NewSessionDialog::NewSessionDialog()
m_template->set_title(_("select template"));
Gtk::FileFilter* session_filter = manage (new (Gtk::FileFilter));
@@ -1630,7 +1627,7 @@ index 2724785..c316a87 100644
session_filter->add_pattern(X_("*.ardour"));
session_filter->add_pattern(X_("*.ardour.bak"));
m_open_filechooser->set_filter (*session_filter);
-@@ -463,7 +484,7 @@ NewSessionDialog::NewSessionDialog()
+@@ -463,7 +481,7 @@ NewSessionDialog::NewSessionDialog()
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));
@@ -1639,7 +1636,7 @@ index 2724785..c316a87 100644
page_set = Pages (0);
}
-@@ -552,7 +573,7 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+@@ -552,7 +570,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.
@@ -1648,7 +1645,7 @@ index 2724785..c316a87 100644
as result of all this, we take two distinct pathways through the code.
*/
-@@ -569,7 +590,6 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+@@ -569,7 +587,6 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
engine_page_session_folder = realdir;
}
@@ -1656,7 +1653,7 @@ index 2724785..c316a87 100644
#else
char* res;
if (!Glib::file_test (dir, Glib::FILE_TEST_IS_DIR)) {
-@@ -582,7 +602,7 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+@@ -582,7 +599,7 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
m_folder->set_current_folder (res);
free (res);
}
@@ -1665,7 +1662,7 @@ index 2724785..c316a87 100644
#endif
}
-@@ -590,7 +610,8 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
+@@ -590,7 +607,8 @@ NewSessionDialog::set_session_folder(const Glib::ustring& dir)
std::string
NewSessionDialog::session_name() const
{
@@ -1675,7 +1672,7 @@ index 2724785..c316a87 100644
std::string::size_type position = str.find_last_of ('/');
str = str.substr (position+1);
position = str.find_last_of ('.');
-@@ -602,7 +623,7 @@ NewSessionDialog::session_name() const
+@@ -602,7 +620,7 @@ NewSessionDialog::session_name() const
if ((position = str.rfind(".bak")) != string::npos) {
str = str.substr (0, position);
@@ -1684,7 +1681,7 @@ index 2724785..c316a87 100644
*/
switch (which_page()) {
-@@ -615,7 +636,7 @@ NewSessionDialog::session_name() const
+@@ -615,7 +633,7 @@ NewSessionDialog::session_name() const
return Glib::filename_from_utf8(m_name->get_text());
default:
break;
@@ -1693,7 +1690,7 @@ index 2724785..c316a87 100644
if (m_treeview->get_selection()->count_selected_rows() == 0) {
return Glib::filename_from_utf8(str);
-@@ -630,7 +651,6 @@ NewSessionDialog::session_folder() const
+@@ -630,7 +648,6 @@ NewSessionDialog::session_folder() const
switch (which_page()) {
case NewPage:
return Glib::filename_from_utf8(m_folder->get_filename());
@@ -1701,7 +1698,7 @@ index 2724785..c316a87 100644
case EnginePage:
if (!(page_set & OpenPage) && !(page_set & NewPage)) {
/* just engine page, nothing else */
-@@ -645,9 +665,9 @@ NewSessionDialog::session_folder() const
+@@ -645,9 +662,9 @@ NewSessionDialog::session_folder() const
default:
break;
}
@@ -1713,7 +1710,7 @@ index 2724785..c316a87 100644
return Glib::path_get_dirname(filename);
}
-@@ -809,7 +829,7 @@ NewSessionDialog::reset_name()
+@@ -809,7 +826,7 @@ NewSessionDialog::reset_name()
{
m_name->set_text("");
set_response_sensitive (Gtk::RESPONSE_OK, false);
@@ -1722,7 +1719,7 @@ index 2724785..c316a87 100644
}
void
-@@ -898,11 +918,57 @@ NewSessionDialog::file_chosen ()
+@@ -898,11 +915,57 @@ NewSessionDialog::file_chosen ()
}
if (!m_open_filechooser->get_filename().empty()) {
@@ -1782,7 +1779,7 @@ index 2724785..c316a87 100644
}
void
-@@ -982,61 +1048,61 @@ NewSessionDialog::reset_recent()
+@@ -982,61 +1045,61 @@ NewSessionDialog::reset_recent()
std::vector<string *> *sessions;
std::vector<string *>::iterator i;
RecentSessionsSorter cmp;
--
ardour Debian packaging
More information about the pkg-multimedia-commits
mailing list