From ff75dc7ac7124334c7a4547adac14f4d14254926 Mon Sep 17 00:00:00 2001 From: GZharun Date: Tue, 2 Sep 2014 19:07:36 +0300 Subject: [PATCH 1/4] [Summary] Changed region name fonts to the correct --- gtk2_ardour/time_axis_view_item.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index b560d819cc..12b5cca30e 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -61,9 +61,9 @@ using namespace Gtkmm2ext; // GZ: Should be moved to config #ifdef _WIN32 - Pango::FontDescription TimeAxisViewItem::NAME_FONT("Helvetica 8"); -#else Pango::FontDescription TimeAxisViewItem::NAME_FONT("Arial 8"); +#else + Pango::FontDescription TimeAxisViewItem::NAME_FONT("Helvetica 8"); #endif const double TimeAxisViewItem::NAME_HIGHLIGHT_Y_INDENT = 1.0; From 654bce5c84c024dee002f394ded5af1496009973 Mon Sep 17 00:00:00 2001 From: nikolay Date: Tue, 2 Sep 2014 19:24:25 +0300 Subject: [PATCH 2/4] [Summary] Change in menu 1st hunk. Delete unused variables 2nd hunk [Review] GZharun --- gtk2_ardour/ardour_ui_ed.cc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 8628584d06..1aab3117f0 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -231,7 +231,7 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (main_actions, X_("Close"), _("Close"), sigc::mem_fun(*this, &ARDOUR_UI::close_session)); ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (main_actions, X_("AddTrackBus"), _("Add Track or Bus..."), + act = ActionManager::register_action (main_actions, X_("AddTrackBus"), _("Add Track"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act); @@ -543,17 +543,6 @@ ARDOUR_UI::build_menu_bar () #else use_menubar_as_top_menubar (); #endif - - bool wall_clock = false; - bool disk_space = false; - - if (!Profile->get_small_screen()) { -#ifndef GTKOSX - // OSX provides its own wallclock, thank you very much - wall_clock = true; -#endif - disk_space = true; - } menu_hbox.pack_end (*ev, false, false, 6); From 9ac221f53e888988b51eddd6c4145886865b063b Mon Sep 17 00:00:00 2001 From: nikolay Date: Tue, 2 Sep 2014 19:25:52 +0300 Subject: [PATCH 3/4] [Summary] For sample rate changed algorithm for conversion string to float --- gtk2_ardour/tracks_control_panel.logic.cc | 27 +++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/tracks_control_panel.logic.cc b/gtk2_ardour/tracks_control_panel.logic.cc index b55981c1eb..66f6eb3642 100644 --- a/gtk2_ardour/tracks_control_panel.logic.cc +++ b/gtk2_ardour/tracks_control_panel.logic.cc @@ -1658,8 +1658,31 @@ TracksControlPanel::bufsize_as_string (uint32_t sz) framecnt_t TracksControlPanel::get_sample_rate () const { - float r = atof (_sample_rate_combo.get_active_text ()); - /* the string may have been translated with an abbreviation for + const string sample_rate = _sample_rate_combo.get_active_text (); + + if ( "44.1 kHz" == sample_rate ) + { + return 44100; + } else if ( "48 kHz" == sample_rate ) + { + return 48000; + } else if ( "88.2 kHz" == sample_rate ) + { + return 88200; + } else if ( "96 kHz" == sample_rate ) + { + return 96000; + } else if ( "172.4 kHz" == sample_rate ) + { + return 172400; + } else if ( "192 kHz" == sample_rate ) + { + return 192000; + } + + float r = atof (sample_rate); + + /* the string may have been translated with an abbreviation for * thousands, so use a crude heuristic to fix this. */ if (r < 1000.0) { From b7afba12ba215885d4c71cbb1652f36381ebeeb2 Mon Sep 17 00:00:00 2001 From: nikolay Date: Tue, 2 Sep 2014 19:27:21 +0300 Subject: [PATCH 4/4] [Summary] Set default color to track headers on new session [Reviewed] GZharun --- gtk2_ardour/route_ui.cc | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index fef257e31d..baf4e792f5 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -204,20 +204,10 @@ RouteUI::set_route (boost::shared_ptr rp) Gdk::Color color; Editor* editor = dynamic_cast( &(ARDOUR_UI::instance()->the_editor()) ); - if( editor!=NULL && editor->set_session_in_progress() ) - { - if( _route->is_master() ) - color = (Gdk::Color)(MixerStrip::XMLColor[master_color]); - else - color = MixerStrip::palette_random_color(); - } - else - { - if( _route->is_master() ) - color = (Gdk::Color)(MixerStrip::XMLColor[master_color]); - else - color = (Gdk::Color)(MixerStrip::XMLColor[default_palette_color]); - } + if ( _route->is_master() ) + color = (Gdk::Color)(MixerStrip::XMLColor[master_color]); + else + color = (Gdk::Color)(MixerStrip::XMLColor[default_palette_color]); set_color (color); }