From 89742f77a2737b0053119f13f3733c2e7e363ac1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 18 Aug 2014 15:40:56 -0400 Subject: [PATCH 01/52] fix wscript version derivation from git version info --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index eef175ee3c..c215e0c85c 100755 --- a/wscript +++ b/wscript @@ -35,8 +35,8 @@ else: parts = rev.split ('.') MAJOR = parts[0] -MINOR = parts[1] -other = parts[2].split ('-') +other = parts[1].split ('-') +MINOR = other[0] if len(other) > 1: MICRO = other[0] else: From cc56c0ff868f8cc787f0ca8da57baf87a30ed61e Mon Sep 17 00:00:00 2001 From: VKamyshniy Date: Sun, 17 Aug 2014 09:53:11 +0300 Subject: [PATCH 02/52] [Summary] Pixel hunting. --- gtk2_ardour/audio_clock.cc | 76 +++++++++++++++++++--------- gtk2_ardour/ui/mixer_bridge_view.xml | 3 ++ 2 files changed, 56 insertions(+), 23 deletions(-) diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 8c5d1c363f..db703955ef 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -320,27 +320,41 @@ AudioClock::render (cairo_t* cr) if (_need_bg) { if (corner_radius) { - Gtkmm2ext::rounded_bottom_half_rectangle (cr, 0, upper_height + separator_height, - left_rect_width + (separator_height == 0 ? corner_radius : 0), - h, corner_radius); + Gtkmm2ext::rounded_bottom_half_rectangle (cr, + _current_event_expose->area.x, + _current_event_expose->area.y + upper_height + separator_height, + left_rect_width + (separator_height == 0 ? corner_radius : 0), + h, + corner_radius); } else { - cairo_rectangle (cr, 0, upper_height + separator_height, left_rect_width, h); + cairo_rectangle (cr, + _current_event_expose->area.x, + _current_event_expose->area.y + upper_height + separator_height, + left_rect_width, + h); } cairo_fill (cr); } - cairo_move_to (cr, x_leading_padding, upper_height + separator_height + ((h - info_height)/2.0)); + cairo_move_to (cr, + _current_event_expose->area.x + x_leading_padding, + _current_event_expose->area.y + upper_height + separator_height + ((h - info_height)/2.0)); pango_cairo_show_layout (cr, _left_layout->gobj()); if (_need_bg) { if (corner_radius) { - Gtkmm2ext::rounded_bottom_half_rectangle (cr, left_rect_width + separator_height, - upper_height + separator_height, - get_width() - separator_height - left_rect_width, - h, corner_radius); + Gtkmm2ext::rounded_bottom_half_rectangle (cr, + _current_event_expose->area.x + left_rect_width + separator_height, + _current_event_expose->area.y + upper_height + separator_height, + get_width() - separator_height - left_rect_width, + h, + corner_radius); } else { - cairo_rectangle (cr, left_rect_width + separator_height, upper_height + separator_height, - get_width() - separator_height - left_rect_width, h); + cairo_rectangle (cr, + _current_event_expose->area.x + left_rect_width + separator_height, + _current_event_expose->area.y + upper_height + separator_height, + get_width() - separator_height - left_rect_width, + h); } cairo_fill (cr); } @@ -361,9 +375,13 @@ AudioClock::render (cairo_t* cr) /* rather cut off the right end than overlap with the text on the left */ x = x_leading_padding + left_rect_width + separator_height; } - cairo_move_to (cr, x, upper_height + separator_height + ((h - info_height)/2.0)); + cairo_move_to (cr, + _current_event_expose->area.x + x, + _current_event_expose->area.y + upper_height + separator_height + ((h - info_height)/2.0)); } else { - cairo_move_to (cr, x_leading_padding + left_rect_width + separator_height, upper_height + separator_height + ((h - info_height)/2.0)); + cairo_move_to (cr, + _current_event_expose->area.x + x_leading_padding + left_rect_width + separator_height, + _current_event_expose->area.y + upper_height + separator_height + ((h - info_height)/2.0)); } pango_cairo_show_layout (cr, _right_layout->gobj()); @@ -372,9 +390,18 @@ AudioClock::render (cairo_t* cr) if (_need_bg) { if (corner_radius) { - Gtkmm2ext::rounded_bottom_half_rectangle (cr, 0, upper_height + separator_height, get_width(), h, corner_radius); + Gtkmm2ext::rounded_bottom_half_rectangle (cr, + _current_event_expose->area.x, + _current_event_expose->area.y + upper_height + separator_height, + get_width(), + h, + corner_radius); } else { - cairo_rectangle (cr, 0, upper_height + separator_height, get_width(), h); + cairo_rectangle (cr, + _current_event_expose->area.x, + _current_event_expose->area.y + upper_height + separator_height, + get_width(), + h); } cairo_fill (cr); } @@ -400,22 +427,22 @@ AudioClock::render (cairo_t* cr) cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a); cairo_rectangle (cr, - min (get_width() - 2.0, - (double) xcenter + cursor.get_x()/PANGO_SCALE + em_width), - (upper_height - layout_height)/2.0, - 2.0, cursor.get_height()/PANGO_SCALE); + _current_event_expose->area.x + min (get_width() - 2.0, (double) xcenter + cursor.get_x()/PANGO_SCALE + em_width), + _current_event_expose->area.y + (upper_height - layout_height)/2.0, + 2.0, + cursor.get_height()/PANGO_SCALE); cairo_fill (cr); } else { /* we've entered all possible digits, no cursor */ } - } else { if (input_string.empty()) { cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a); cairo_rectangle (cr, - (get_width()/2.0), - (upper_height - layout_height)/2.0, - 2.0, upper_height); + _current_event_expose->area.x + (get_width()/2.0), + _current_event_expose->area.y + (upper_height - layout_height)/2.0, + 2.0, + upper_height); cairo_fill (cr); } } @@ -991,6 +1018,9 @@ AudioClock::set (framepos_t when, bool force, framecnt_t offset) void AudioClock::set_slave_info () { + return; + /* TRACKS: Let's carefully define what we need here + */ if (!_left_layout || !_right_layout) { return; } diff --git a/gtk2_ardour/ui/mixer_bridge_view.xml b/gtk2_ardour/ui/mixer_bridge_view.xml index 9ea3b23e3a..e444ce9aee 100644 --- a/gtk2_ardour/ui/mixer_bridge_view.xml +++ b/gtk2_ardour/ui/mixer_bridge_view.xml @@ -6,7 +6,10 @@ box.expand="true" box.fill="true"> + + + From 9bed4b664c31420b868be7320e02d483405aff28 Mon Sep 17 00:00:00 2001 From: VKamyshniy Date: Sun, 17 Aug 2014 16:24:41 +0300 Subject: [PATCH 03/52] [Summary] Removing unnecessary method WavesButton::on_size_allocate (Allocation& alloc) --- gtk2_ardour/waves_button.cc | 6 ------ gtk2_ardour/waves_button.h | 1 - 2 files changed, 7 deletions(-) diff --git a/gtk2_ardour/waves_button.cc b/gtk2_ardour/waves_button.cc index 373e21c2a5..9c0f2cc6f1 100644 --- a/gtk2_ardour/waves_button.cc +++ b/gtk2_ardour/waves_button.cc @@ -329,12 +329,6 @@ WavesButton::color_handler () set_dirty (); } -void -WavesButton::on_size_allocate (Allocation& alloc) -{ - CairoWidget::on_size_allocate (alloc); -} - void WavesButton::set_controllable (boost::shared_ptr c) { diff --git a/gtk2_ardour/waves_button.h b/gtk2_ardour/waves_button.h index 1c56621067..0d7fe0c9d6 100644 --- a/gtk2_ardour/waves_button.h +++ b/gtk2_ardour/waves_button.h @@ -65,7 +65,6 @@ class WavesButton : public CairoWidget , public Gtkmm2ext::Activatable protected: void render (cairo_t *); void on_size_request (Gtk::Requisition* req); - void on_size_allocate (Gtk::Allocation&); void on_style_changed (const Glib::RefPtr&); void on_name_changed (); bool on_enter_notify_event (GdkEventCrossing*); From 2e47e057ca0f77e1610ba45e6bc77ce7b21f4b5a Mon Sep 17 00:00:00 2001 From: nikolay Date: Mon, 18 Aug 2014 11:22:08 +0300 Subject: [PATCH 04/52] [Summary] Cut track's name in MixerBridge and MeterBridge [Review] GZharun --- gtk2_ardour/editor.cc | 10 ++++++++-- gtk2_ardour/mixer_bridge_view.cc | 2 +- gtk2_ardour/mixer_bridge_view.h | 5 ++++- gtk2_ardour/mixer_strip.cc | 27 ++++++++++++++++++++++++--- gtk2_ardour/mixer_strip.h | 4 +++- 5 files changed, 40 insertions(+), 8 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 1a370dab90..2967f55313 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1306,6 +1306,10 @@ Editor::update_title () } } +namespace { + const size_t mixer_bridge_strip_max_name_size = 9; + const size_t meter_bridge_strip_max_name_size = 6; +} void Editor::set_session (Session *t) { @@ -1328,9 +1332,11 @@ Editor::set_session (Session *t) _routes->set_session (_session); _locations->set_session (_session); _compact_meter_bridge.set_session (_session); - _mixer_bridge_view.set_session (_session); + _mixer_bridge_view.set_max_name_size(mixer_bridge_strip_max_name_size); + _mixer_bridge_view.set_session (_session); + _meter_bridge_view.set_max_name_size(meter_bridge_strip_max_name_size); _meter_bridge_view.set_session (_session); - + if (rhythm_ferret) { rhythm_ferret->set_session (_session); } diff --git a/gtk2_ardour/mixer_bridge_view.cc b/gtk2_ardour/mixer_bridge_view.cc index c37e1fb96f..4dfc3282f6 100644 --- a/gtk2_ardour/mixer_bridge_view.cc +++ b/gtk2_ardour/mixer_bridge_view.cc @@ -184,7 +184,7 @@ MixerBridgeView::add_strips (RouteList& routes) continue; } - MixerStrip* strip = strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), _session, route, _mixer_strip_script_name); + MixerStrip* strip = strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(), _session, route, _mixer_strip_script_name, _max_name_size); strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &MixerBridgeView::strip_button_release_event), strip)); _strips [route] = strip; strip->show(); diff --git a/gtk2_ardour/mixer_bridge_view.h b/gtk2_ardour/mixer_bridge_view.h index 637138705c..effbd43e6b 100644 --- a/gtk2_ardour/mixer_bridge_view.h +++ b/gtk2_ardour/mixer_bridge_view.h @@ -47,9 +47,10 @@ class MixerBridgeView : public MixerActor { public: - MixerBridgeView (const std::string& mixer_bridge_script_name, const std::string& mixer_strip_script_name); + MixerBridgeView (const std::string& mixer_bridge_script_name, const std::string& mixer_strip_script_name = 0); ~MixerBridgeView(); void set_session (ARDOUR::Session *); + void set_max_name_size(size_t size) {_max_name_size = size;} void track_editor_selection (); protected: @@ -81,6 +82,8 @@ class MixerBridgeView : std::map , MixerStrip*> _strips; mutable Glib::Threads::Mutex _resync_mutex; + + size_t _max_name_size; }; #endif //__ardour_mixer_bridge_view_h__ diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 9ae906e887..46a8bd940a 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -125,9 +125,30 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, const std::string& layout_s } } -MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt, const std::string& layout_script_file) +string cut_string(const string& route_name, size_t max_name_size) +{ + if ( max_name_size == 0 ) + return route_name; + + string cutted_route_name; + + if ( route_name.size()<=max_name_size ) + { + cutted_route_name = route_name; + } + else + { + cutted_route_name.assign(route_name, 0, max_name_size-3); + cutted_route_name += "..."; + } + + return cutted_route_name; +} + +MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt, const std::string& layout_script_file, size_t max_name_size) : AxisView(sess) , RouteUI (sess, layout_script_file) + , _max_name_size(max_name_size) , _mixer(mx) , _mixer_owned (xml_property(*xml_tree()->root(), "selfdestruct", true)) , processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, xml_property(*xml_tree()->root(), "selfdestruct", true)) @@ -150,7 +171,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt { init (); set_route (rt); - name_button.set_text (_route->name()); + name_button.set_text ( cut_string(_route->name(), _max_name_size) ); } void @@ -1229,7 +1250,7 @@ MixerStrip::property_changed (const PropertyChange& what_changed) void MixerStrip::name_changed () { - name_button.set_text (_route->name()); + name_button.set_text ( cut_string(_route->name(), _max_name_size) ); ARDOUR_UI::instance()->set_tip (name_button, _route->name()); } diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 417a89f36d..81780bcc44 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -78,7 +78,7 @@ class ArdourWindow; class MixerStrip : public RouteUI { public: - MixerStrip (Mixer_UI&, ARDOUR::Session*, boost::shared_ptr, const std::string& layout_script_file); + MixerStrip (Mixer_UI&, ARDOUR::Session*, boost::shared_ptr, const std::string& layout_script_file, size_t max_name_size = 0); MixerStrip (Mixer_UI&, ARDOUR::Session*, const std::string& layout_script_file); ~MixerStrip (); @@ -144,6 +144,8 @@ class MixerStrip : public RouteUI bool _embedded; bool _packed; bool _mixer_owned; + + size_t _max_name_size; Gtk::EventBox& panners_home; ProcessorBox processor_box; From 4d83cff03653f32799064709c97e94f2cf70e717 Mon Sep 17 00:00:00 2001 From: GZharun Date: Mon, 18 Aug 2014 11:43:17 +0300 Subject: [PATCH 05/52] [Summary] Made master track number hidden correctly [Details] Previous implementation was unsafe in terms of C++ --- gtk2_ardour/audio_time_axis.cc | 7 +------ gtk2_ardour/route_time_axis.cc | 5 +++++ gtk2_ardour/time_axis_view.cc | 11 +++++++++-- gtk2_ardour/time_axis_view.h | 7 +++++-- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index ba19432cf0..6519254a17 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -145,13 +145,8 @@ AudioTimeAxisView::audio_view() guint32 AudioTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) { - bool show_number = true; - if (is_master_track() ) { - show_number = false; - } - set_gui_property ("visible", true); - return TimeAxisView::show_at (y, nth, parent, show_number); + return TimeAxisView::show_at (y, nth, parent); } void diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 65918ce483..097024af41 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -164,6 +164,11 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) track()->PlaylistChanged.connect (*this, invalidator (*this), ui_bind(&RouteTimeAxisView::update_playlist_tip, this), gui_context()); } + if (is_master_track() ) { + // do not display number for master track + TimeAxisView::set_number_is_hidden(true); + } + playlist_button.set_visible(is_track() && track()->mode() == ARDOUR::Normal); LevelMeterHBox& level_meter = gm.get_level_meter(); diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index a99bb291a5..d003dc7d0d 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -84,6 +84,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, , selection_group (0) , _ghost_group (0) , _hidden (false) + , _number_is_hidden (false) , in_destructor (false) , _size_menu (0) , _canvas_display (0) @@ -215,6 +216,12 @@ TimeAxisView::hide () Hiding (); } +void +TimeAxisView::set_number_is_hidden (bool hidden) +{ + _number_is_hidden = hidden; +} + /** Display this TimeAxisView as the nth component of the parent box, at y. * * @param y y position. @@ -223,7 +230,7 @@ TimeAxisView::hide () * @return height of this TimeAxisView. */ guint32 -TimeAxisView::show_at (double y, int& nth, VBox *parent, bool show_number) +TimeAxisView::show_at (double y, int& nth, VBox *parent) { time_axis_box.show (); if (control_parent) { @@ -235,7 +242,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent, bool show_number) } _order = nth; - if (show_number) { + if (!_number_is_hidden) { number_label.set_text (string_compose (_("%1"), _order)); } else { number_label.set_text(""); diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index 689eff56f0..ee93a54998 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -127,9 +127,11 @@ class TimeAxisView : public virtual AxisView void idle_resize (uint32_t); - virtual guint32 show_at (double y, int& nth, Gtk::VBox *parent, bool show_number = true); + virtual guint32 show_at (double y, int& nth, Gtk::VBox *parent); virtual void hide (); + void set_number_is_hidden (bool); + bool touched (double top, double bot); /** @return true if hidden, otherwise false */ @@ -220,7 +222,8 @@ class TimeAxisView : public virtual AxisView std::list ghosts; std::list free_selection_rects; std::list used_selection_rects; - bool _hidden; + bool _number_is_hidden; + bool _hidden; bool in_destructor; Gtk::Menu* _size_menu; ArdourCanvas::Group* _canvas_display; From c94a36a980f7df48b168edd02f11515d7e27fe74 Mon Sep 17 00:00:00 2001 From: GZharun Date: Mon, 18 Aug 2014 12:05:19 +0300 Subject: [PATCH 06/52] [Summary] Fixed build --- gtk2_ardour/editor_routes.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 1323388b25..2077a9dc04 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -534,7 +534,7 @@ EditorRoutes::redisplay () /* show or hide the TimeAxisView */ if (visible) { - position += tv->show_at (position, n, &_editor->edit_controls_vbox, show_number); + position += tv->show_at (position, n, &_editor->edit_controls_vbox); // SHOWTRACKS } else { tv->hide (); From 1f243fd0d6f632519348889f1f9284849b8f4ce1 Mon Sep 17 00:00:00 2001 From: GZharun Date: Mon, 18 Aug 2014 12:10:54 +0300 Subject: [PATCH 07/52] [Summary] Removed unused code --- gtk2_ardour/editor_routes.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 2077a9dc04..570a28fe83 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -526,12 +526,6 @@ EditorRoutes::redisplay () bool visible = tv->marked_for_display (); - bool show_number = true; - boost::shared_ptr at = boost::dynamic_pointer_cast(route); - if (at && at->is_master_track() ) { - show_number = false; - } - /* show or hide the TimeAxisView */ if (visible) { position += tv->show_at (position, n, &_editor->edit_controls_vbox); From 4dab63411cd109e3d8216aecd85cfd6789cf77d3 Mon Sep 17 00:00:00 2001 From: VKamyshniy Date: Mon, 18 Aug 2014 15:07:46 +0300 Subject: [PATCH 08/52] [Summary] Implementing change requests from Igor. --- gtk2_ardour/icons/time_axis_monitor_input.png | Bin 1056 -> 185 bytes gtk2_ardour/icons/time_axis_mute.png | Bin 1123 -> 262 bytes gtk2_ardour/icons/time_axis_record.png | Bin 1105 -> 243 bytes gtk2_ardour/icons/time_axis_solo.png | Bin 308 -> 270 bytes gtk2_ardour/ui/audio_time_axis.xml | 11 ++++++++--- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/icons/time_axis_monitor_input.png b/gtk2_ardour/icons/time_axis_monitor_input.png index 7bc9c7c7d8dbd98263a2cb88b49e786aefe67afd..47fae900ad64e40c31645ae25760470aaff62ea0 100644 GIT binary patch delta 157 zcmZ3$v6FFvN`sfJq{rrCh7Sn0~Ht;7&r?&B8wRqi!d|L<2hoWSmUaH0?M+lD~*KC4OB`qr#oUCfZw==jz{ z;RgQ^w&uGNL)aJh$&@}xV0JzgTe~ HDWM4f_VYIa literal 1056 zcmbVLO=#0l9FLm}nGQYdu#E{JI|(*t1167e}Z*Lu;Wrmq-JGDBg zmu{;Tc6l?#@R93NHp48hM80WlBEmM&hT~yr&wVeR1@04rS z&Zec<+{#UMIZ~;Bi-^faZpRDND9a6WRl1L_1&$p+$Yz!sI#n-KSRDt5m3WY_KpL`X zk%uBsMCCf01P}-?DS%7@0#(YW0J5Wpqt*hurB;o?$QC_ixi%rbDhRz^kME^;9Bc?s zQ4|3rg=8{85s7fyBW9HF!lki-fkG>AeBxk_jTOx%?vgA=JspPN`lZr|uosRJMN=k3 zrY}Gq2(BB)H9&`?ivGB9Dmtuf`$(vw5O)KM)}ysFCez%VZ72p(Z`3=1LyKZ|3~Y5> z(*Yc5D?$GJr56f=m*mWe61r6g`#7q_mV=potx8oXXY2f|1XQP|6q(=Ea

eh$@sKT< zmgB`Yae;>M8Ypn?A-fP@mmOqSbx!j@{5Nu0*3(K_(j-~ViJ~TQBd+~FSre!;LfjsI zwafU5_F%j{X?}V*86V`)nF;7{xG$dlpo3K|8d@#-(ENUU{PP_+Ja=)gwfMGgH|HiA z?;q{=pPZkYpI4ZJH;v0jzixHF!l(WIV)ygYrCr>p%sjr)>u-rKSFb8x4>g9FxWw%4 VO?|0O9(;^vwwNy)&vT9YzXAE4Nmc*= diff --git a/gtk2_ardour/icons/time_axis_mute.png b/gtk2_ardour/icons/time_axis_mute.png index 16bd09a37b2283200183706ee10c2162dec78b94..e53aa0c1d4dbd5a4880a7add2ea3c47b70c4290c 100644 GIT binary patch delta 234 zcmVM?s9>M``&~-il z000DMK}|sb0I`n?{9y$E005OqL_t(|+GG6x|Gy-|UafKf+|I&vsFl7$+E zOrJhI4M+(B@#@UX%zIF=au5yVcMb|i0zoJcyFeXU0dydU-D3fjqu7zujPCbP$1*@2 z{GM6{Q`3>FfmjI`ipEgKt{#kz1f|8Z43KD60^&V`(UBkk3OyGnJt(6a=135rS}20S kXai%^k%J73I+9ud0O|E3<9pKiod5s;07*qoM6N<$g57smH2?qr literal 1123 zcmbVLO-K|`93LwzwZemtg~Bi%Drjfk+nw3n8QgT8S#6^+TNe@|aCYYD4muyrJl#>~ zP!@fmAVfh?WOe9}T|+!bmnaBA=oC>M>Jmu^MR@Ct?plF#Xkg}j%;>E}$XPPBGsW78%+!Qp`y~1*$8fqIqP( zL%kE-d3|D77Y(NEFx?tRM8HB=qXTQi_N5@jtm#T*A6|0|y#~R3Rs3tEwBq zwqH&ZNf{StE(ck_SymX=8rsJ>^xKV1(SCm1MO+T~&Zwu8dJMKy$Rv0FHWUJhH_~y> zBt_9i6h|Mmkd3oSiXnek!!#ryBmsm89wee5o`g_@K$K&#L@XUkc9O(aG&bYL5@|l8 z#6>716bLhXhtQ!Yaz++GIx349vBJ&TKGtjCs&d^q+!R)JI+X@1A2-M zcKo8_(sHlBLR!^y(++RK0Giu7Q(-DrMt*ccyVlbP|zaLm`O+GMb1vPwE1ye)iRSy_Dz zUR2dxA8dLxZ4?@}47{0nFx~Wc{xdT9tlTbZ>zrW`4)a>->RAY0^(Q8AqOFO-Bs-Hh<>1r0=HPzG)Q2S5p`80PmayA_MY^Gaz(lK!U7w@8G A=Kufz diff --git a/gtk2_ardour/icons/time_axis_record.png b/gtk2_ardour/icons/time_axis_record.png index 2d9b23da641d72ca0f974c0a4554010c9c313e99..f33df063bf9fd9148d08a5e053f9fae57d76b82e 100644 GIT binary patch delta 215 zcmcb}@tJXgN`sfJq{smORh659r+9l44efXk;M!Qa)&^eG4DdD9Z--Z-O<;P zfnj4m_n$;oAiv4e#WAGfR`Q?!|M#mLPGEOFIMIjsZ9|}YpH-2D)uh%aHsASnw!9vk zN}O|9AKA{FIa6e|@7W1FtyVm3)(sJzQf$GxDhm?=_=T!XuT1>THe31h!Yv9{8s}ay zm~yMnru&J9c$TEs=@)IOOTJH$@;a@=F-2^p@T|qWJ%R3gMh34uvKSebZ{CU literal 1105 zcmbVLO=#0l9FJ3m&P{e0;$%X|=0UW{du`G-admV_yA|x5UBRlCrpenHwtSep*>)FY zZUa$Y{NL_rk6(-0B#A~GYbg z<<$~JQpS~4hl4EOOw*66iuP~@{c>Ynw3n?oh|3_)9(OfTkKxWbndI)@hI}CLMmppg zq$ui`Vr%0jvT#a?G2{=c8@dF9D1b1+gGdmBqY#P^h;k?t3B^OvBuQ*tV_j~XPb!H7 zfI>upFv0fHb)w&V7Li-ot#%a8`eq@xt91>C2nEr;GF3r=)uxn0bG+t8cM+@%)+Hi)#CaA9;52)8V~*`_+Xj kFB>1<=rxF9oo!0KZcl32+VA$Bt{U?zX z$e-)!;uunKEBVj=|NB)AC$Kvooan>+wjt2H&#FknYEo+yo9}!(S(jF(jY0zZ*&kh1 zurfBDoV0nRM?s9>M``&~-il000DMK}|sb z0I`n?{9y$E006^DL_t(|+GF(b@%hg%$N>wKW*lgT-~&tp?SNt9NES*Bkd%}pN&WNZ z&q=mpNQC5&a3sai4Fg6-Mj$E_h?Ri&JrJ)3(dW*cqu6X}hJR!^5O+Y?X+XS+S_V_o zkuE@d7Kmp7aTpNq8H|pc1$F2<21qF08;p(wr9)*Pc4dHsD9EA4gUyj3M}g8MD4J(c z(Ol}~ZU#sQ&IDpmg9Q|-6%3FN9XyT%7BwITnNZQwa4;ka^HE2RC`VG9amZ - - - @@ -20,6 +23,8 @@ + + From aba2595572c0c2cbb9a1e47fc26e282e97faef7f Mon Sep 17 00:00:00 2001 From: VKamyshniy Date: Mon, 18 Aug 2014 19:27:01 +0300 Subject: [PATCH 09/52] [Summary] Making different fonts for WIN and MAC --- gtk2_ardour/ui/add_tracks_dialog.xml | 5 +- gtk2_ardour/ui/audio_time_axis.xml | 15 ++- gtk2_ardour/ui/device_capture_control.xml | 4 +- gtk2_ardour/ui/device_playback_control.xml | 4 +- gtk2_ardour/ui/editor_mixer.xml | 10 +- gtk2_ardour/ui/master_ui.xml | 3 +- gtk2_ardour/ui/midi_device_control.xml | 4 +- gtk2_ardour/ui/mixer_strip.xml | 4 +- gtk2_ardour/ui/session_close_dialog.xml | 52 ++++++---- gtk2_ardour/ui/session_dialog.xml | 106 +++++++++++++++++---- gtk2_ardour/ui/session_lock_dialog.xml | 4 +- gtk2_ardour/ui/tracks_preferences.xml | 101 ++++++++++++++------ gtk2_ardour/waves_button.cc | 41 ++++---- gtk2_ardour/waves_button.h | 4 +- gtk2_ardour/waves_ui.cc | 13 ++- 15 files changed, 258 insertions(+), 112 deletions(-) diff --git a/gtk2_ardour/ui/add_tracks_dialog.xml b/gtk2_ardour/ui/add_tracks_dialog.xml index 8675da8e10..b7bbbaf40a 100644 --- a/gtk2_ardour/ui/add_tracks_dialog.xml +++ b/gtk2_ardour/ui/add_tracks_dialog.xml @@ -1,6 +1,8 @@

-