summaryrefslogtreecommitdiff
path: root/libs/ardour/audio_diskstream.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2008-12-18 19:31:00 +0000
committerCarl Hetherington <carl@carlh.net>2008-12-18 19:31:00 +0000
commit4e1f451520975868659f4c00d00883f5f1cd5805 (patch)
tree7a8a51d65d70932e8151bbbeafc8eae49e60cd65 /libs/ardour/audio_diskstream.cc
parentbe655cc5af1b059de77bb4215c13f14013fc73da (diff)
Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite/freestore-mgmt.html#faq-16.8 Apologies for the big commit.
git-svn-id: svn://localhost/ardour2/branches/3.0@4332 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_diskstream.cc')
-rw-r--r--libs/ardour/audio_diskstream.cc36
1 files changed, 12 insertions, 24 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 4cf834b5c1..8ba1825759 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -2470,33 +2470,21 @@ AudioDiskstream::ChannelInfo::~ChannelInfo ()
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;
}