ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Remove dead code.

Browse Source
This commit is contained in:
David Robillard 2014-11-25 02:11:44 -05:00
parent 8b268344f9
commit ea5876b836
36 changed files with 7 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/ardour_display.h
View File

@ -53,10 +53,6 @@ class ArdourDisplay : public ArdourButton
private:
Gtk::Menu _menu;
bool _hovering;
bool _grabbed;
float _grabbed_y;
};
#endif /* __gtk2_ardour_ardour_menu_h__ */

1
gtk2_ardour/audio_region_view.cc
View File

@ -72,7 +72,6 @@ using namespace PBD;
using namespace Editing;
using namespace ArdourCanvas;
static const int32_t sync_mark_width = 9;
static double const handle_size = 10; /* height of fade handles */
AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,

1
gtk2_ardour/bundle_manager.cc
View File

@ -424,7 +424,6 @@ NameChannelDialog::NameChannelDialog ()
NameChannelDialog::NameChannelDialog (boost::shared_ptr<Bundle> b, uint32_t c)
: ArdourDialog (_("Rename Channel")),
_bundle (b),
_channel (c),
_adding (false)
{
_name.set_text (b->channel_name (c));

1
gtk2_ardour/bundle_manager.h
View File

@ -131,7 +131,6 @@ private:
void setup ();
boost::shared_ptr<ARDOUR::Bundle> _bundle;
uint32_t _channel;
Gtk::Entry _name;
bool _adding;
};

2
gtk2_ardour/editor_drag.cc
View File

@ -4110,9 +4110,7 @@ SelectionDrag::SelectionDrag (Editor* e, ArdourCanvas::Item* i, Operation o)
: Drag (e, i)
, _operation (o)
, _add (false)
, _extend (false)
, _original_pointer_time_axis (-1)
, _last_pointer_time_axis (-1)
, _time_selection_at_start (!_editor->get_selection().time.empty())
{
DEBUG_TRACE (DEBUG::Drags, "New SelectionDrag\n");

4
gtk2_ardour/editor_drag.h
View File

@ -829,8 +829,6 @@ private:
AutomationLine* _line;
double _fixed_grab_x;
double _fixed_grab_y;
uint32_t _before;
uint32_t _after;
double _cumulative_y_drag;
};
@ -978,9 +976,7 @@ public:
private:
Operation _operation;
bool _add;
bool _extend;
int _original_pointer_time_axis;
int _last_pointer_time_axis;
std::list<TimeAxisView*> _added_time_axes;
bool _time_selection_at_start;
framepos_t start_at_start;

2
gtk2_ardour/editor_ops.cc
View File

@ -4963,7 +4963,7 @@ Editor::quantize_region ()
qd->hide ();
if (r == Gtk::RESPONSE_OK) {
Quantize quant (*_session, qd->snap_start(), qd->snap_end(),
Quantize quant (qd->snap_start(), qd->snap_end(),
qd->start_grid_size(), qd->end_grid_size(),
qd->strength(), qd->swing(), qd->threshold());

2
gtk2_ardour/midi_region_view.cc
View File

@ -3388,8 +3388,6 @@ MidiRegionView::paste_internal (framepos_t pos, unsigned paste_count, float time
return;
}
PublicEditor& editor = trackview.editor ();
start_note_diff_command (_("paste"));
const Evoral::MusicalTime snap_beats = get_grid_beats(pos);

2
gtk2_ardour/mixer_strip.cc
View File

@ -80,8 +80,6 @@ MixerStrip* MixerStrip::_entered_mixer_strip;
PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
static const int _button_vpad = 4;
MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
: AxisView(sess)
, RouteUI (sess)

1
gtk2_ardour/processor_box.cc
View File

@ -108,7 +108,6 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo
, _parent (parent)
, _processor (p)
, _width (w)
, _visual_state (Gtk::STATE_NORMAL)
, _input_icon(true)
, _output_icon(false)
{

1
gtk2_ardour/processor_box.h
View File

@ -163,7 +163,6 @@ private:
ProcessorBox* _parent;
boost::shared_ptr<ARDOUR::Processor> _processor;
Width _width;
Gtk::StateType _visual_state;
PBD::ScopedConnection active_connection;
PBD::ScopedConnection name_connection;
PBD::ScopedConnection config_connection;

4
gtk2_ardour/rc_option_editor.cc
View File

@ -67,8 +67,7 @@ class ClickOptions : public OptionEditorBox
{
public:
ClickOptions (RCConfiguration* c, Gtk::Window* p)
: _rc_config (c),
_parent (p)
: _rc_config (c)
{
Table* t = manage (new Table (2, 3));
t->set_spacings (4);
@ -154,7 +153,6 @@ private:
}
RCConfiguration* _rc_config;
Gtk::Window* _parent;
Entry _click_path_entry;
Entry _click_emphasis_path_entry;
};

1
gtk2_ardour/route_group_dialog.h
View File

@ -50,7 +50,6 @@ private:
Gtk::CheckButton _route_active;
Gtk::CheckButton _share_color;
Gtk::CheckButton _share_monitoring;
Gtk::Button* _ok;
Gtk::ColorButton _color;
void gain_toggled ();

2
gtk2_ardour/route_ui.cc
View File

@ -68,8 +68,6 @@ uint32_t RouteUI::_max_invert_buttons = 3;
PBD::Signal1<void, boost::shared_ptr<Route> > RouteUI::BusSendDisplayChanged;
boost::weak_ptr<Route> RouteUI::_showing_sends_to;
static const int _button_vpad = 2;
RouteUI::RouteUI (ARDOUR::Session* sess)
: AxisView(sess)
, mute_menu(0)

1
gtk2_ardour/speaker_dialog.h
View File

@ -48,7 +48,6 @@ private:
Gtk::SpinButton azimuth_spinner;
Gtk::Button add_speaker_button;
Gtk::Button remove_speaker_button;
int32_t selected_speaker;
int width; ///< width of the circle
int height; ///< height of the circle
int x_origin; ///< x origin of our stuff within the drawing area

1
gtk2_ardour/stereo_panner.h
View File

@ -66,7 +66,6 @@ class StereoPanner : public PannerInterface
boost::shared_ptr<PBD::Controllable> width_control;
PBD::ScopedConnectionList panvalue_connections;
PBD::ScopedConnectionList panshell_connections;
bool dragging;
bool dragging_position;
bool dragging_left;
bool dragging_right;

1
gtk2_ardour/sys_ex.cc
View File

@ -31,7 +31,6 @@ SysEx::SysEx (
double height,
double x,
double y)
: _region (region)
{
_flag = new ArdourCanvas::Flag (
parent,

1
gtk2_ardour/sys_ex.h
View File

@ -47,7 +47,6 @@ public:
private:
bool event_handler (GdkEvent* ev);
MidiRegionView& _region;
ArdourCanvas::Flag* _flag;
};

1
gtk2_ardour/tempo_lines.h
View File

@ -37,7 +37,6 @@ public:
private:
ArdourCanvas::LineSet lines;
double _height;
};
#endif /* __ardour_tempo_lines_h__ */

3
libs/ardour/ardour/audio_track_importer.h
View File

@ -40,9 +40,6 @@ class LIBARDOUR_API AudioTrackImportHandler : public ElementImportHandler
AudioTrackImportHandler (XMLTree const & source, Session & session, AudioPlaylistImportHandler & pl_handler);
virtual ~AudioTrackImportHandler () {}
virtual std::string get_info () const;
private:
AudioPlaylistImportHandler & pl_handler;
};

5
libs/ardour/ardour/quantize.h
View File

@ -27,11 +27,9 @@
namespace ARDOUR {
class Session;
class LIBARDOUR_API Quantize : public MidiOperator {
public:
Quantize (ARDOUR::Session&, bool snap_start, bool snap_end,
Quantize (bool snap_start, bool snap_end,
double start_grid, double end_grid,
float strength, float swing, float threshold);
~Quantize ();
@ -42,7 +40,6 @@ public:
std::string name() const { return std::string ("quantize"); }
private:
ARDOUR::Session& session;
bool _snap_start;
bool _snap_end;
double _start_grid;

1
libs/ardour/ardour/slave.h
View File

@ -507,7 +507,6 @@ class LIBARDOUR_API Engine_Slave : public Slave
private:
AudioEngine& engine;
double speed;
bool _starting;
};

2
libs/ardour/ardour/sndfilesource.h
View File

@ -105,8 +105,6 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
bool _capture_end;
framepos_t capture_start_frame;
framepos_t file_pos; // unit is frames
framecnt_t xfade_out_count;
framecnt_t xfade_in_count;
Sample* xfade_buf;
framecnt_t crossfade (Sample* data, framecnt_t cnt, int dir);

3
libs/ardour/audio_track_importer.cc
View File

@ -40,8 +40,7 @@ using namespace ARDOUR;
/*** AudioTrackImportHandler ***/
AudioTrackImportHandler::AudioTrackImportHandler (XMLTree const & source, Session & session, AudioPlaylistImportHandler & pl_handler) :
ElementImportHandler (source, session),
pl_handler (pl_handler)
ElementImportHandler (source, session)
{
XMLNode const * root = source.root();
XMLNode const * routes;

5
libs/ardour/quantize.cc
View File

@ -35,11 +35,10 @@ using namespace ARDOUR;
* 0.25 = quantize to beats/4, etc.
*/
Quantize::Quantize (Session& s, bool snap_start, bool snap_end,
Quantize::Quantize (bool snap_start, bool snap_end,
double start_grid, double end_grid,
float strength, float swing, float threshold)
: session (s)
, _snap_start (snap_start)
: _snap_start (snap_start)
, _snap_end (snap_end)
, _start_grid(start_grid)
, _end_grid(end_grid)

14
libs/ardour/session_butler.cc
View File

@ -34,20 +34,6 @@ using namespace std;
using namespace ARDOUR;
using namespace PBD;
/* XXX put this in the right place */
static inline uint32_t next_power_of_two (uint32_t n)
{
--n;
n |= n >> 16;
n |= n >> 8;
n |= n >> 4;
n |= n >> 2;
n |= n >> 1;
++n;
return n;
}
/*---------------------------------------------------------------------------
BUTLER THREAD
---------------------------------------------------------------------------*/

1
libs/canvas/canvas/curve.h
View File

@ -54,7 +54,6 @@ class LIBCANVAS_API Curve : public PolyItem, public InterpolatedCurve
Points samples;
Points::size_type n_samples;
uint32_t points_per_segment;
InterpolatedCurve::SplineType curve_type;
CurveFill curve_fill;
void interpolate ();

1
libs/canvas/canvas/image.h
View File

@ -97,7 +97,6 @@ private:
Cairo::Format _format;
int _width;
int _height;
int _data;
mutable boost::shared_ptr<Data> _current;
boost::shared_ptr<Data> _pending;
mutable bool _need_render;

2
libs/canvas/curve.cc
View File

@ -31,7 +31,6 @@ Curve::Curve (Canvas* c)
: PolyItem (c)
, n_samples (0)
, points_per_segment (16)
, curve_type (CatmullRomCentripetal)
, curve_fill (None)
{
}
@ -40,7 +39,6 @@ Curve::Curve (Item* parent)
: PolyItem (parent)
, n_samples (0)
, points_per_segment (16)
, curve_type (CatmullRomCentripetal)
, curve_fill (None)
{
}

6
libs/canvas/wave_view.cc
View File

@ -176,12 +176,6 @@ WaveView::set_samples_per_pixel (double samples_per_pixel)
}
}
static inline double
image_to_window (double wave_origin, double image_start)
{
return wave_origin + image_start;
}
static inline double
window_to_image (double wave_origin, double image_start)
{

2
libs/gtkmm2ext/gtkmm2ext/selector.h
View File

@ -96,8 +96,6 @@ public:
void *refill_arg;
gint selected_row;
gint selected_column;
gint chosen_row;
gint chosen_column;
void refill ();
void chosen ();

2
libs/pbd/pbd/pool.h
View File

@ -129,8 +129,6 @@ class LIBPBD_API PerThreadPool
private:
Glib::Threads::Private<CrossThreadPool> _key;
std::string _name;
unsigned long _item_size;
unsigned long _nitems;
/** mutex to protect either changes to the _trash variable, or writes to the RingBuffer */
Glib::Threads::Mutex _trash_mutex;

1
libs/pbd/pbd/system_exec.h
View File

@ -221,7 +221,6 @@ class LIBPBD_API SystemExec
void init ();
pthread_mutex_t write_lock;
int fdin; ///< file-descriptor for writing to child's STDIN. This variable is identical to pin[1] but also used as status check if the stdin pipe is open: <0 means closed.
int pok[2];
int pin[2];
int pout[2];

8
libs/pbd/pbd/uuid.h
View File

@ -41,14 +41,6 @@ class LIBPBD_API UUID : public boost::uuids::uuid {
: boost::uuids::uuid(u)
{}
operator boost::uuids::uuid() {
return static_cast<boost::uuids::uuid&>(*this);
}
operator boost::uuids::uuid() const {
return static_cast<boost::uuids::uuid const&>(*this);
}
UUID& operator= (std::string const & str);
std::string to_s () const;

1
libs/surfaces/generic_midi/midiaction.h
View File

@ -55,7 +55,6 @@ class MIDIAction : public MIDIInvokable
int set_state (const XMLNode&, int version);
private:
Gtk::Action* _action;
void execute ();
};

2
libs/surfaces/mackie/controls.cc
View File

@ -118,7 +118,7 @@ void
Control::stop_touch (double when, bool mark)
{
if (normal_ac) {
return normal_ac->stop_touch (when, mark);
return normal_ac->stop_touch (mark, when);
}
}