{
save_ardour_state ();
- if (keyboard) {
- delete keyboard;
- }
-
- if (editor) {
- delete editor;
- }
-
- if (mixer) {
- delete mixer;
- }
-
- if (add_route_dialog) {
- delete add_route_dialog;
- }
-
-
- if (new_session_dialog) {
- delete new_session_dialog;
- }
+ delete keyboard;
+ delete editor;
+ delete mixer;
+ delete add_route_dialog;
+ delete new_session_dialog;
}
void
/* all waveviews etc will be destroyed when the group is destroyed */
- if (gain_line) {
- delete gain_line;
- }
+ delete gain_line;
}
boost::shared_ptr<ARDOUR::AudioRegion>
void
CanvasFlag::delete_allocated_objects()
{
- if (_text) {
- delete _text;
- _text = 0;
- }
-
- if (_line) {
- delete _line;
- _line = 0;
- }
-
- if (_rect) {
- delete _rect;
- _rect = 0;
- }
+ delete _text;
+ _text = 0;
+
+ delete _line;
+ _line = 0;
+
+ delete _rect;
+ _rect = 0;
}
void
delete _text;
}
- if (_channel_selector_widget)
- delete _channel_selector_widget;
+ delete _channel_selector_widget;
}
void
}
#endif
- if (track_canvas) {
- delete track_canvas;
- track_canvas = 0;
- }
+ delete track_canvas;
+ track_canvas = 0;
}
void
// first idle adds route children (automation tracks), so we need to redisplay here
redisplay_route_list();
- if (dialog) {
- delete dialog;
- }
+ delete dialog;
_have_idled = true;
}
Editor::LocationMarkers::~LocationMarkers ()
{
- if (start) {
- delete start;
- }
-
- if (end) {
- delete end;
- }
+ delete start;
+ delete end;
}
Editor::LocationMarkers *
hide_measures ();
clear_marker_display ();
- if (current_bbt_points) {
- delete current_bbt_points;
- current_bbt_points = 0;
- }
+ delete current_bbt_points;
+ current_bbt_points = 0;
/* mixer strip will be deleted all by itself
when its route is deleted.
visual_states.push_back (0);
}
- if (visual_states[n] != 0) {
- delete visual_states[n];
- }
+ delete visual_states[n];
visual_states[n] = current_visual_state (true);
gdk_beep ();
}
next_beat.ticks = 0;
- if (current_bbt_points) {
- delete current_bbt_points;
- current_bbt_points = 0;
- }
+ delete current_bbt_points;
+ current_bbt_points = 0;
current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1);
}
int
Editor::time_fx (RegionSelection& regions, float val, bool pitching)
{
- if (current_timefx != 0) {
- delete current_timefx;
- }
+ delete current_timefx;
current_timefx = new TimeFXDialog (*this, pitching);
iter = next ;
}
- if(image_action_menu)
- {
- delete image_action_menu ;
- image_action_menu = 0 ;
- }
+ delete image_action_menu ;
+ image_action_menu = 0 ;
- if (selection_group)
- {
- delete selection_group;
- selection_group = 0 ;
- }
+ delete selection_group;
+ selection_group = 0 ;
// Destroy our Axis View helper
- if(view)
- {
- delete view ;
- view = 0 ;
- }
+ delete view ;
+ view = 0 ;
}
//---------------------------------------------------------------------------------------//
}
}
- if(imageframe)
- {
-delete imageframe;
- imageframe = 0 ;
- }
+ delete imageframe;
+ imageframe = 0 ;
}
LevelMeter::~LevelMeter ()
{
for (vector<MeterInfo>::iterator i = meters.begin(); i != meters.end(); i++) {
- if ((*i).meter) {
- delete (*i).meter;
- }
+ delete (*i).meter;
}
}
delete mark;
delete points;
- if (line) {
- delete line;
- line = 0;
- }
+ delete line;
+ line = 0;
}
void Marker::reparent(ArdourCanvas::Group & parent)
iter = next ;
}
- if(canvas_rect)
- {
- delete canvas_rect;
- canvas_rect = 0 ;
- }
-
- if(canvas_group)
- {
- delete canvas_group;
- canvas_group = 0 ;
- }
+ delete canvas_rect;
+ canvas_rect = 0 ;
+
+ delete canvas_group;
+ canvas_group = 0 ;
}
RouteUI::set_route (rt);
- if (input_selector) {
- delete input_selector;
- input_selector = 0;
- }
+ delete input_selector;
+ input_selector = 0;
- if (output_selector) {
- delete output_selector;
- output_selector = 0;
- }
+ delete output_selector;
+ output_selector = 0;
panners.set_io (rt);
gpm.set_io (rt);
{
connections.clear ();
- if (pan_astyle_menu) {
- delete pan_astyle_menu;
- pan_astyle_menu = 0;
- }
-
- if (pan_astate_menu) {
- delete pan_astate_menu;
- pan_astate_menu = 0;
- }
+ delete pan_astyle_menu;
+ pan_astyle_menu = 0;
+
+ delete pan_astate_menu;
+ pan_astate_menu = 0;
_io = io;
connections.push_back (_io->panner().LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage)));
connections.push_back (_io->panner().StateChanged.connect (mem_fun(*this, &PannerUI::update_pan_state)));
- if (panner) {
- delete panner;
- panner = 0;
- }
+ delete panner;
+ panner = 0;
setup_pan ();
delete (*i);
}
- if (panner) {
- delete panner;
- }
-
- if (big_window) {
- delete big_window;
- }
-
- if (pan_menu) {
- delete pan_menu;
- }
-
- if (pan_astyle_menu) {
- delete pan_astyle_menu;
- }
-
- if (pan_astate_menu) {
- delete pan_astate_menu;
- }
+ delete panner;
+ delete big_window;
+ delete pan_menu;
+ delete pan_astyle_menu;
+ delete pan_astate_menu;
}
throw;
}
- if (tmp1) delete tmp1;
- if (tmp2) delete tmp1;
- if (tmp3) delete tmp1;
+ delete tmp1;
+ delete tmp2;
+ delete tmp3;
_buffer_size = size;
_signal_buffer_size = signal_size;
_side_vbox.children().clear ();
- if (_side_vbox_pad) {
- delete _side_vbox_pad;
- _side_vbox_pad = 0;
- }
+ delete _side_vbox_pad;
+ _side_vbox_pad = 0;
for (std::vector<PortGroupUI*>::iterator i = _port_group_ui.begin(); i != _port_group_ui.end(); ++i) {
_visibility_checkbutton_box.remove ((*i)->get_visibility_checkbutton());
delete *g;
}
- if (editor) {
- delete editor;
- }
+ delete editor;
}
gint
RhythmFerret::~RhythmFerret()
{
- if (logo) {
- delete logo;
- }
+ delete logo;
}
void
delete *i;
}
- if (playlist_menu) {
- delete playlist_menu;
- playlist_menu = 0;
- }
+ delete playlist_menu;
+ playlist_menu = 0;
- if (playlist_action_menu) {
- delete playlist_action_menu;
- playlist_action_menu = 0;
- }
+ delete playlist_action_menu;
+ playlist_action_menu = 0;
- if (_view) {
- delete _view;
- _view = 0;
- }
+ delete _view;
+ _view = 0;
for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
delete i->second;
RouteTimeAxisView::playlist_click ()
{
// always build a new action menu
-
- if (playlist_action_menu != 0) {
- delete playlist_action_menu;
- }
+
+ delete playlist_action_menu;
playlist_action_menu = new Menu;
playlist_action_menu->set_name ("ArdourContextMenu");
automation_items.push_back (SeparatorElem());
- if (i->second->menu_item)
- delete i->second->menu_item;
+ delete i->second->menu_item;
automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param),
bind (mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param)));
menu->set_name ("ArdourContextMenu");
playlist_items.clear();
- if (playlist_menu) {
- delete playlist_menu;
- }
+ delete playlist_menu;
playlist_menu = new Menu;
playlist_menu->set_name ("ArdourContextMenu");
{
connections.clear ();
- if (solo_menu) {
- delete solo_menu;
- solo_menu = 0;
- }
+ delete solo_menu;
+ solo_menu = 0;
- if (mute_menu) {
- delete mute_menu;
- mute_menu = 0;
- }
+ delete mute_menu;
+ mute_menu = 0;
if (xml_node) {
/* do not delete the node - its owned by the route */
void
SoundFileBrowser::add_gain_meter ()
{
- if (gm) {
- delete gm;
- }
+ delete gm;
gm = new GainMeter (*session);
gm->set_io (session->the_auditioner());
delete (*i);
}
- if (selection_group) {
- delete selection_group;
- selection_group = 0;
- }
+ delete selection_group;
+ selection_group = 0;
- if (canvas_background) {
- delete canvas_background;
- canvas_background = 0;
- }
+ delete canvas_background;
+ canvas_background = 0;
- if (canvas_display) {
- delete canvas_display;
- canvas_display = 0;
- }
+ delete canvas_display;
+ canvas_display = 0;
- if (display_menu) {
- delete display_menu;
- display_menu = 0;
- }
+ delete display_menu;
+ display_menu = 0;
}
guint32
write_source.reset ();
}
- if (speed_buffer) {
- delete [] speed_buffer;
- speed_buffer = 0;
- }
+ delete [] speed_buffer;
+ speed_buffer = 0;
- if (playback_wrap_buffer) {
- delete [] playback_wrap_buffer;
- playback_wrap_buffer = 0;
- }
+ delete [] playback_wrap_buffer;
+ playback_wrap_buffer = 0;
- if (capture_wrap_buffer) {
- delete [] capture_wrap_buffer;
- capture_wrap_buffer = 0;
- }
+ delete [] capture_wrap_buffer;
+ capture_wrap_buffer = 0;
- if (playback_buf) {
- delete playback_buf;
- playback_buf = 0;
- }
+ delete playback_buf;
+ playback_buf = 0;
- if (capture_buf) {
- delete capture_buf;
- capture_buf = 0;
- }
+ delete capture_buf;
+ capture_buf = 0;
- if (capture_transition_buf) {
- delete capture_transition_buf;
- capture_transition_buf = 0;
- }
+ delete capture_transition_buf;
+ capture_transition_buf = 0;
}
AudioPort::~AudioPort()
{
- if (_ext_port) {
- delete _ext_port;
- _ext_port = 0;
- }
+ delete _ext_port;
+ _ext_port = 0;
}
void
g_rename (tmp_path.c_str(), path.c_str());
}
- if (data) {
- delete [] data;
- }
+ delete [] data;
return ret;
}
::close (peakfile);
}
- if (peak_leftovers) {
- delete [] peak_leftovers;
- }
+ delete [] peak_leftovers;
}
XMLNode&
close (_peakfile);
}
- if (staging) {
- delete [] staging;
- }
-
- if (raw_staging) {
- delete [] raw_staging;
- }
+ delete [] staging;
+ delete [] raw_staging;
#ifdef DEBUG_READ_PEAKS
cerr << "RP DONE\n";
unlink (peakpath.c_str());
}
- if (buf) {
- delete [] buf;
- }
+ delete [] buf;
return ret;
}
out:
delete [] peakbuf;
- if (buf2) {
- delete [] buf2;
- }
+ delete [] buf2;
+
return ret;
}
BaseAudioPort::~BaseAudioPort ()
{
- if (_own_buffer && _buffer) {
+ if (_own_buffer) {
delete _buffer;
}
}
BaseMidiPort::~BaseMidiPort()
{
- if (_own_buffer && _buffer) {
+ if (_own_buffer) {
delete _buffer;
}
}
void
Crossfade::set_buffer_size (nframes_t sz)
{
- if (crossfade_buffer_out) {
- delete [] crossfade_buffer_out;
- crossfade_buffer_out = 0;
- }
+ delete [] crossfade_buffer_out;
+ crossfade_buffer_out = 0;
- if (crossfade_buffer_in) {
- delete [] crossfade_buffer_in;
- crossfade_buffer_in = 0;
- }
+ delete [] crossfade_buffer_in;
+ crossfade_buffer_in = 0;
if (sz) {
crossfade_buffer_out = new Sample[sz];
RegionExportChannelFactory::~RegionExportChannelFactory ()
{
- if (mixdown_buffer) {
- delete[] mixdown_buffer;
- }
-
- if (gain_buffer) {
- delete[] gain_buffer;
- }
+ delete[] mixdown_buffer;
+ delete[] gain_buffer;
}
ExportChannelPtr
ExportPreset::~ExportPreset ()
{
- if (local) {
- delete local;
- }
+ delete local;
}
void
if (src_state) {
src_delete (src_state);
}
- if (data_out) {
- delete [] data_out;
- }
+
+ delete [] data_out;
+
if (leftover_data) {
free (leftover_data);
}
nframes_t out_samples_max = (nframes_t) ceil (frames * src_data.src_ratio * channels);
if (data_out_size < out_samples_max) {
- if (data_out) {
- delete[] data_out;
- }
+ delete[] data_out;
+
data_out = new float[out_samples_max];
src_data.data_out = data_out;
if (dither) {
gdither_free (dither);
}
- if (data_out) {
- delete[] data_out;
- }
+
+ delete[] data_out;
}
template <typename TOut>
size_t data_size = channels * frames * sizeof (TOut);
if (data_size > data_out_size) {
- if (data_out) {
- delete[] data_out;
- }
+
+ delete[] data_out;
+
data_out = new TOut[data_size];
data_out_size = data_size;
}
// dlclose (module);
- if (_control_data) {
- delete [] _control_data;
- }
-
- if (_shadow_data) {
- delete [] _shadow_data;
- }
+ delete [] _control_data;
+ delete [] _shadow_data;
}
string
LocationImporter::~LocationImporter ()
{
- if (!queued() && location) {
+ if (!queued()) {
delete location;
}
}
void
LocationImporter::_cancel_move ()
{
- if (location) {
- delete location;
- location = 0;
- }
+ delete location;
+ location = 0;
}
void
slv2_value_free(_name);
slv2_value_free(_author);
- if (_control_data) {
- delete [] _control_data;
- }
-
- if (_shadow_data) {
- delete [] _shadow_data;
- }
+ delete [] _control_data;
+ delete [] _shadow_data;
}
string
MidiPort::~MidiPort()
{
- if (_ext_port) {
- delete _ext_port;
- _ext_port = 0;
- }
+ delete _ext_port;
+ _ext_port = 0;
}
void
out:
- if (gain_buffer) {
- delete [] gain_buffer;
- }
+ delete [] gain_buffer;
if (buffers) {
for (uint32_t i = 0; i < channels; ++i) {
/* note: derived classes set flags */
- if (_extra_xml) {
- delete _extra_xml;
- _extra_xml = 0;
- }
+ delete _extra_xml;
+ _extra_xml = 0;
for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) {
out:
- if (buf) {
- delete [] buf;
- }
+ delete [] buf;
if (ret) {
for (si = nsrcs.begin(); si != nsrcs.end(); ++si) {
nlist = node.children();
- if (deferred_state) {
- delete deferred_state;
- }
-
+ delete deferred_state;
deferred_state = new XMLNode(X_("deferred state"));
/* set parent class properties before anything else */
vector<string>::const_iterator i;
size_t limit;
- if (_control_outs) {
- delete _control_outs;
- _control_outs = 0;
- }
+ delete _control_outs;
+ _control_outs = 0;
if (is_control() || is_master()) {
/* no control outs for these two special busses */
ensure_buffers(_scratch_buffers->available());
- if (_gain_automation_buffer) {
- delete [] _gain_automation_buffer;
- }
+ delete [] _gain_automation_buffer;
_gain_automation_buffer = new gain_t[nframes];
allocate_pan_automation_buffers (nframes, _npan_buffers, true);
if ((which == 0 || which == 1)) {
- if (click_data && click_data != default_click) {
+ if (click_data != default_click) {
delete [] click_data;
click_data = 0;
}
if ((which == 0 || which == -1)) {
- if (click_emphasis_data && click_emphasis_data != default_click_emphasis) {
+ if (click_emphasis_data != default_click_emphasis) {
delete [] click_emphasis_data;
click_emphasis_data = 0;
}
int
Session::load_state (string snapshot_name)
{
- if (state_tree) {
- delete state_tree;
- state_tree = 0;
- }
+ delete state_tree;
+ state_tree = 0;
state_was_pending = false;
// return;
// }
- if (_slave) {
- delete _slave;
- _slave = 0;
- }
+ delete _slave;
+ _slave = 0;
if (_transport_speed < 0.0) {
reverse = true;
touch_peakfile ();
}
- if (_broadcast_info) {
- delete _broadcast_info;
- }
-
- if (xfade_buf) {
- delete [] xfade_buf;
- }
+ delete _broadcast_info;
+ delete [] xfade_buf;
}
float
xfade_frames = (nframes_t) floor ((Config->get_destructive_xfade_msecs () / 1000.0) * rate);
- if (out_coefficient) {
- delete [] out_coefficient;
- }
-
- if (in_coefficient) {
- delete [] in_coefficient;
- }
+ delete [] out_coefficient;
+ delete [] in_coefficient;
out_coefficient = new gain_t[xfade_frames];
in_coefficient = new gain_t[xfade_frames];
out:
- if (gain_buffer) {
- delete [] gain_buffer;
- }
-
- if (buffer) {
- delete [] buffer;
- }
+ delete [] gain_buffer;
+ delete [] buffer;
if (ret || tsr.cancel) {
for (SourceList::iterator si = nsrcs.begin(); si != nsrcs.end(); ++si) {
MultiAllocSingleReleasePool::~MultiAllocSingleReleasePool ()
{
- if(m_lock) delete m_lock;
+ delete m_lock;
}
SingleAllocMultiReleasePool::SingleAllocMultiReleasePool (string n, unsigned long isize, unsigned long nitems)
SingleAllocMultiReleasePool::~SingleAllocMultiReleasePool ()
{
- if(m_lock) delete m_lock;
+ delete m_lock;
}
void*
// Do not delete _extra_xml. The use of add_child_nocopy()
// means it needs to live on indefinately.
- if (_instant_xml) {
- delete _instant_xml;
- }
+ delete _instant_xml;
}
void
XMLTree::~XMLTree()
{
- if (_root) {
- delete _root;
- }
+ delete _root;
}
int
{
//shouldnt be used anywhere ATM, remove if so!
assert(!validate);
- if (_root) {
- delete _root;
- _root = 0;
- }
+
+ delete _root;
+ _root = 0;
xmlParserCtxtPtr ctxt; /* the parser context */
xmlDocPtr doc; /* the resulting document tree */
_filename = "";
- if (_root) {
- delete _root;
- _root = 0;
- }
+ delete _root;
+ _root = 0;
doc = xmlParseMemory((char *) buffer.c_str(), buffer.length());
if (!doc) {
}
}
- if (dptr) {
- delete dptr;
- }
+ delete dptr;
}
void
if ( _ports_changed )
{
// create new pollfd structures
- if ( pfd != 0 )
- {
- delete[] pfd;
- pfd = 0;
- }
+ delete[] pfd;
pfd = new pollfd[_ports.size()];
#ifdef DEBUG
cout << "pfd: " << pfd << endl;
projects / ardour.git / commitdiff