smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

experiment - no space in meterbridge.

Browse source
This commit is contained in:
Robin Gareus 2013-07-02 23:49:01 +02:00
parent a3f3f5e502
commit 2d0309c092
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/meter_strip.cc
View file

@ -181,8 +181,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
); );
meter_configuration_changed (_route->shared_peak_meter()->input_streams ()); meter_configuration_changed (_route->shared_peak_meter()->input_streams ());
meter_ticks1_area.set_size_request(3,-1); meter_ticks1_area.set_size_request(4,-1);
meter_ticks2_area.set_size_request(3,-1); meter_ticks2_area.set_size_request(4,-1);
meter_ticks1_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks1_expose)); meter_ticks1_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks1_expose));
meter_ticks2_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks2_expose)); meter_ticks2_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks2_expose));
@ -674,13 +674,13 @@ MeterStrip::render_ticks (Gtk::Widget& w, vector<DataType> types)
fraction = log_meter (j->first); fraction = log_meter (j->first);
pos = height - (gint) floor (height * fraction); pos = height - (gint) floor (height * fraction);
cairo_move_to(cr, 0, pos + .5); cairo_move_to(cr, 0, pos + .5);
cairo_line_to(cr, 3, pos + .5); cairo_line_to(cr, 4, pos + .5);
cairo_stroke (cr); cairo_stroke (cr);
break; break;
case DataType::MIDI: case DataType::MIDI:
fraction = (j->first) / 127.0; fraction = (j->first) / 127.0;
pos = height - (gint) floor (height * fraction); pos = height - (gint) floor (height * fraction);
cairo_arc(cr, 1.5, pos, (j->second), 0, 2 * M_PI); cairo_arc(cr, 2, pos, (j->second), 0, 2 * M_PI);
cairo_fill_preserve(cr); cairo_fill_preserve(cr);
cairo_stroke (cr); cairo_stroke (cr);
break; break;

2
gtk2_ardour/meterbridge.cc
View file

@ -148,7 +148,7 @@ Meterbridge::Meterbridge ()
Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Meterbridge::sync_order_keys, this, _1), gui_context()); Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Meterbridge::sync_order_keys, this, _1), gui_context());
MeterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Meterbridge::remove_strip, this, _1), gui_context()); MeterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Meterbridge::remove_strip, this, _1), gui_context());
global_hpacker.set_spacing(4); global_hpacker.set_spacing(0);
scroller.add (global_hpacker); scroller.add (global_hpacker);
scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER); scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER);
global_vpacker.pack_start (scroller, true, true); global_vpacker.pack_start (scroller, true, true);