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

Minor changes from MIDI branch

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@734 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2006-08-01 19:17:49 +00:00
parent 49ab8ea455
commit c37b641702
4 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gtk2_ardour/ardour_ui.cc
View file

@ -116,16 +116,15 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
shuttle_units_button (_("% ")), shuttle_units_button (_("% ")),
punch_in_button (_("punch\nin")), punch_in_button (_("Punch In")),
punch_out_button (_("punch\nout")), punch_out_button (_("Punch Out")),
auto_return_button (_("auto\nreturn")), auto_return_button (_("Auto Return")),
auto_play_button (_("auto\nplay")), auto_play_button (_("Autuo Play")),
auto_input_button (_("auto\ninput")), auto_input_button (_("Auto Input")),
click_button (_("click")), click_button (_("Click")),
auditioning_alert_button (_("AUDITIONING")), auditioning_alert_button (_("AUDITION")),
solo_alert_button (_("SOLO")), solo_alert_button (_("SOLO")),
shown_flag (false) shown_flag (false)
{ {
using namespace Gtk::Menu_Helpers; using namespace Gtk::Menu_Helpers;

6
gtk2_ardour/canvas-waveview.h
View file

@ -80,10 +80,10 @@ struct _GnomeCanvasWaveView
void (*gain_curve_function)(void *arg, double start, double end, float* vector, guint32 veclen); void (*gain_curve_function)(void *arg, double start, double end, float* vector, guint32 veclen);
void *gain_src; void *gain_src;
/* x-axis: samples per canvas unit. */ /** x-axis: samples per canvas unit. */
double samples_per_unit; double samples_per_unit;
/* y-axis: amplitude_above_axis. /** y-axis: amplitude_above_axis.
* *
* the default is that an (scaled, normalized -1.0 ... +1.0) amplitude of 1.0 * the default is that an (scaled, normalized -1.0 ... +1.0) amplitude of 1.0
* corresponds to the top of the area assigned to the waveview. * corresponds to the top of the area assigned to the waveview.
@ -92,8 +92,8 @@ struct _GnomeCanvasWaveView
* smaller values will decrease the vertical scale, moving peaks/troughs toward * smaller values will decrease the vertical scale, moving peaks/troughs toward
* the middle of the area assigned to the waveview. * the middle of the area assigned to the waveview.
*/ */
double amplitude_above_axis; double amplitude_above_axis;
double x; double x;
double y; double y;
double height; double height;

6
gtk2_ardour/mixer_strip.h
View file

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2000 Paul Davis Copyright (C) 2000-2006 Paul Davis
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -14,8 +14,6 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id$
*/ */
#ifndef __ardour_mixer_strip__ #ifndef __ardour_mixer_strip__
@ -171,8 +169,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
Gtk::Menu output_menu; Gtk::Menu output_menu;
void add_connection_to_output_menu (ARDOUR::Connection *); void add_connection_to_output_menu (ARDOUR::Connection *);
void stream_input_chosen (ARDOUR::AudioDiskstream*);
void select_stream_input ();
void connection_input_chosen (ARDOUR::Connection *); void connection_input_chosen (ARDOUR::Connection *);
void connection_output_chosen (ARDOUR::Connection *); void connection_output_chosen (ARDOUR::Connection *);

8
gtk2_ardour/panner_ui.cc
View file

@ -14,8 +14,6 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id$
*/ */
#include <limits.h> #include <limits.h>
@ -327,11 +325,7 @@ PannerUI::setup_pan ()
bc->StopGesture.connect (bind (mem_fun (*_io, &IO::end_pan_touch), (uint32_t) asz)); bc->StopGesture.connect (bind (mem_fun (*_io, &IO::end_pan_touch), (uint32_t) asz));
char buf[64]; char buf[64];
#ifdef __APPLE__ snprintf (buf, sizeof (buf), _("panner for channel %zu"), asz + 1);
snprintf (buf, sizeof (buf), _("panner for channel %lu"), asz + 1);
#else
snprintf (buf, sizeof (buf), _("panner for channel %u"), asz + 1);
#endif
ARDOUR_UI::instance()->tooltips().set_tip (bc->event_widget(), buf); ARDOUR_UI::instance()->tooltips().set_tip (bc->event_widget(), buf);
bc->event_widget().signal_button_release_event().connect bc->event_widget().signal_button_release_event().connect