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

Fixes for GCC 4.3.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3303 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-05-02 18:35:05 +00:00
parent 38eb5f4539
commit da45f489dd
40 changed files with 61 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/actions.cc
View file

@ -17,6 +17,7 @@
*/ */
#include <cstring>
#include <vector> #include <vector>
#include <string> #include <string>
#include <list> #include <list>

3
gtk2_ardour/automation_controller.cc
View file

@ -74,12 +74,13 @@ AutomationController::create(boost::shared_ptr<Automatable> parent, boost::share
void void
AutomationController::update_label(char* label, int label_len) AutomationController::update_label(char* label, int label_len)
{ {
if (label && label_len) if (label && label_len) {
// Hack to display CC rounded to int // Hack to display CC rounded to int
if (_controllable->parameter().type() == MidiCCAutomation) if (_controllable->parameter().type() == MidiCCAutomation)
snprintf(label, label_len, "%d", (int)_controllable->get_value()); snprintf(label, label_len, "%d", (int)_controllable->get_value());
else else
snprintf(label, label_len, "%.3f", _controllable->get_value()); snprintf(label, label_len, "%.3f", _controllable->get_value());
}
} }
void void

1
gtk2_ardour/editing.cc
View file

@ -18,6 +18,7 @@
*/ */
#include <string> #include <string>
#include <cstring>
#include "editing.h" #include "editing.h"

2
gtk2_ardour/editor.cc
View file

@ -3733,7 +3733,7 @@ Editor::get_valid_views (TimeAxisView* track, RouteGroup* group)
v->push_back (*i); v->push_back (*i);
} }
} else if (track != 0 && group == 0 || (track != 0 && group != 0 && !group->is_active())) { } else if ((track != 0 && group == 0) || (track != 0 && group != 0 && !group->is_active())) {
/* just the view for this track /* just the view for this track
*/ */

2
gtk2_ardour/editor_mouse.cc
View file

@ -518,7 +518,7 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
(mouse_mode != MouseTimeFX || item_type != RegionItem) && (mouse_mode != MouseTimeFX || item_type != RegionItem) &&
(mouse_mode != MouseRange)) || (mouse_mode != MouseRange)) ||
(event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE || event->button.button > 3)) { ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3)) {
return; return;
} }

1
gtk2_ardour/fft_result.cc
View file

@ -21,6 +21,7 @@
#include <fft_result.h> #include <fft_result.h>
#include <fft_graph.h> #include <fft_graph.h>
#include <cstdlib> #include <cstdlib>
#include <cstring>
#include <string> #include <string>
#include <cmath> #include <cmath>

3
gtk2_ardour/midi_region_view.cc
View file

@ -289,11 +289,12 @@ MidiRegionView::canvas_event(GdkEvent* ev)
if (_mouse_state == AddDragging) if (_mouse_state == AddDragging)
event_x = trackview.editor.frame_to_pixel(event_frame); event_x = trackview.editor.frame_to_pixel(event_frame);
if (drag_rect) if (drag_rect) {
if (event_x > drag_start_x) if (event_x > drag_start_x)
drag_rect->property_x2() = event_x; drag_rect->property_x2() = event_x;
else else
drag_rect->property_x1() = event_x; drag_rect->property_x1() = event_x;
}
if (drag_rect && _mouse_state == SelectRectDragging) { if (drag_rect && _mouse_state == SelectRectDragging) {
if (event_y > drag_start_y) if (event_y > drag_start_y)

10
gtk2_ardour/new_session_dialog.cc
View file

@ -738,7 +738,7 @@ NewSessionDialog::which_page () const
} else if (page_set == EnginePage) { } else if (page_set == EnginePage) {
return EnginePage; return EnginePage;
} else if (page_set == NewPage|OpenPage) { } else if (page_set == (NewPage|OpenPage)) {
switch (num) { switch (num) {
case 0: case 0:
return NewPage; return NewPage;
@ -746,7 +746,7 @@ NewSessionDialog::which_page () const
return OpenPage; return OpenPage;
} }
} else if (page_set == NewPage|EnginePage) { } else if (page_set == (NewPage|EnginePage)) {
switch (num) { switch (num) {
case 0: case 0:
return NewPage; return NewPage;
@ -754,7 +754,7 @@ NewSessionDialog::which_page () const
return EnginePage; return EnginePage;
} }
} else if (page_set == NewPage|EnginePage|OpenPage) { } else if (page_set == (NewPage|EnginePage|OpenPage)) {
switch (num) { switch (num) {
case 0: case 0:
return NewPage; return NewPage;
@ -764,7 +764,7 @@ NewSessionDialog::which_page () const
return EnginePage; return EnginePage;
} }
} else if (page_set == OpenPage|EnginePage) { } else if (page_set == (OpenPage|EnginePage)) {
switch (num) { switch (num) {
case 0: case 0:
return OpenPage; return OpenPage;
@ -772,6 +772,8 @@ NewSessionDialog::which_page () const
return EnginePage; return EnginePage;
} }
} }
return NewPage; /* shouldn't get here */
} }
void void

2
gtk2_ardour/route_time_axis.cc
View file

@ -1229,7 +1229,7 @@ RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top,
nframes_t start_adjusted = session_frame_to_track_frame(start, speed); nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
nframes_t end_adjusted = session_frame_to_track_frame(end, speed); nframes_t end_adjusted = session_frame_to_track_frame(end, speed);
if (_view && ((top < 0.0 && bot < 0.0)) || touched (top, bot)) { if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) {
_view->get_selectables (start_adjusted, end_adjusted, results); _view->get_selectables (start_adjusted, end_adjusted, results);
} }

6
gtk2_ardour/sfdb_ui.cc
View file

@ -399,11 +399,11 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
found_list (ListStore::create(found_list_columns)), found_list (ListStore::create(found_list_columns)),
freesound_list (ListStore::create(freesound_list_columns)), freesound_list (ListStore::create(freesound_list_columns)),
chooser (FILE_CHOOSER_ACTION_OPEN), chooser (FILE_CHOOSER_ACTION_OPEN),
found_list_view (found_list),
freesound_list_view (freesound_list),
preview (persistent), preview (persistent),
found_search_btn (_("Search")), found_search_btn (_("Search")),
freesound_search_btn (_("Start Downloading")) found_list_view (found_list),
freesound_search_btn (_("Start Downloading")),
freesound_list_view (freesound_list)
{ {
resetting_ourselves = false; resetting_ourselves = false;

6
libs/ardour/amp.cc
View file

@ -16,10 +16,10 @@
675 Mass Ave, Cambridge, MA 02139, USA. 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <ardour/amp.h> #include <cstring>
#include <algorithm>
#include <cmath> #include <cmath>
#include <algorithm>
#include <ardour/amp.h>
#include <ardour/buffer_set.h> #include <ardour/buffer_set.h>
#include <ardour/audio_buffer.h> #include <ardour/audio_buffer.h>

1
libs/ardour/ardour/audio_buffer.h
View file

@ -19,6 +19,7 @@
#ifndef __ardour_audio_buffer_h__ #ifndef __ardour_audio_buffer_h__
#define __ardour_audio_buffer_h__ #define __ardour_audio_buffer_h__
#include <cstring>
#include <ardour/buffer.h> #include <ardour/buffer.h>
namespace ARDOUR { namespace ARDOUR {

1
libs/ardour/ardour/silentfilesource.h
View file

@ -20,6 +20,7 @@
#ifndef __ardour_silentfilesource_h__ #ifndef __ardour_silentfilesource_h__
#define __ardour_silentfilesource_h__ #define __ardour_silentfilesource_h__
#include <cstring>
#include <ardour/audiofilesource.h> #include <ardour/audiofilesource.h>
namespace ARDOUR { namespace ARDOUR {

4
libs/ardour/audio_diskstream.cc
View file

@ -398,8 +398,8 @@ AudioDiskstream::check_record_status (nframes_t transport_frame, nframes_t nfram
/* if per-track or global rec-enable turned on while the other was already on, we've started recording */ /* if per-track or global rec-enable turned on while the other was already on, we've started recording */
if ((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record) || if (((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record)) ||
((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled()))) { (((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled())))) {
/* starting to record: compute first+last frames */ /* starting to record: compute first+last frames */

1
libs/ardour/audioanalyser.cc
View file

@ -1,3 +1,4 @@
#include <cstring>
#include <vamp-sdk/hostext/PluginLoader.h> #include <vamp-sdk/hostext/PluginLoader.h>
#include <glibmm/miscutils.h> #include <glibmm/miscutils.h>
#include <glibmm/fileutils.h> #include <glibmm/fileutils.h>

2
libs/ardour/automation_event.cc
View file

@ -1210,7 +1210,7 @@ AutomationList::rt_safe_earliest_event_linear_unlocked (double start, double end
x = first->when + (y - first->value) / (double)slope; x = first->when + (y - first->value) / (double)slope;
while ((inclusive && x < start) || x <= start && y != next->value) { while ((inclusive && x < start) || (x <= start && y != next->value)) {
if (first->value < next->value) // ramping up if (first->value < next->value) // ramping up
y += 1.0; y += 1.0;

1
libs/ardour/find_session.cc
View file

@ -1,6 +1,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <cstring>
#include <climits> #include <climits>
#include <cerrno> #include <cerrno>

4
libs/ardour/gdither.cc
View file

@ -387,7 +387,7 @@ void gdither_runf(GDither s, uint32_t channel, uint32_t length,
} }
/* some common case handling code - looks a bit wierd, but it allows /* some common case handling code - looks a bit wierd, but it allows
* the compiler to optiomise out the branches in the inner loop */ * the compiler to optimise out the branches in the inner loop */
if (s->bit_depth == 8 && s->dither_depth == 8) { if (s->bit_depth == 8 && s->dither_depth == 8) {
switch (s->type) { switch (s->type) {
case GDitherNone: case GDitherNone:
@ -411,7 +411,7 @@ void gdither_runf(GDither s, uint32_t channel, uint32_t length,
ss, x, y, MAX_U8, MIN_U8); ss, x, y, MAX_U8, MIN_U8);
break; break;
} }
} else if (s->bit_depth == s->dither_depth == 16) { } else if (s->bit_depth == 16 && s->dither_depth == 16) {
switch (s->type) { switch (s->type) {
case GDitherNone: case GDitherNone:
gdither_innner_loop(GDitherNone, s->channels, 0.0f, SCALE_S16, gdither_innner_loop(GDitherNone, s->channels, 0.0f, SCALE_S16,

4
libs/ardour/midi_diskstream.cc
View file

@ -339,7 +339,7 @@ MidiDiskstream::check_record_status (nframes_t transport_frame, nframes_t nframe
/* if per-track or global rec-enable turned on while the other was already on, we've started recording */ /* if per-track or global rec-enable turned on while the other was already on, we've started recording */
if ((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record) || if (((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record)) ||
((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled()))) { ((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled()))) {
/* starting to record: compute first+last frames */ /* starting to record: compute first+last frames */
@ -909,7 +909,7 @@ MidiDiskstream::do_flush (Session::RunContext context, bool force_flush)
total = _session.transport_frame() - _last_flush_frame; total = _session.transport_frame() - _last_flush_frame;
if (total == 0 || _capture_buf->read_space() == 0 && _session.transport_speed() == 0 || (total < disk_io_chunk_frames && !force_flush && was_recording)) { if (total == 0 || (_capture_buf->read_space() == 0 && _session.transport_speed() == 0) || (total < disk_io_chunk_frames && !force_flush && was_recording)) {
goto out; goto out;
} }

1
libs/ardour/recent_sessions.cc
View file

@ -17,6 +17,7 @@
*/ */
#include <cstring>
#include <cerrno> #include <cerrno>
#include <unistd.h> #include <unistd.h>
#include <fstream> #include <fstream>

4
libs/ardour/session.cc
View file

@ -134,8 +134,8 @@ Session::Session (AudioEngine &eng,
_session_dir (new SessionDirectory(fullpath)), _session_dir (new SessionDirectory(fullpath)),
pending_events (2048), pending_events (2048),
post_transport_work((PostTransportWork)0), post_transport_work((PostTransportWork)0),
midi_requests (128),
_send_smpte_update (false), _send_smpte_update (false),
midi_requests (128),
diskstreams (new DiskstreamList), diskstreams (new DiskstreamList),
routes (new RouteList), routes (new RouteList),
auditioner ((Auditioner*) 0), auditioner ((Auditioner*) 0),
@ -204,8 +204,8 @@ Session::Session (AudioEngine &eng,
_session_dir ( new SessionDirectory(fullpath)), _session_dir ( new SessionDirectory(fullpath)),
pending_events (2048), pending_events (2048),
post_transport_work((PostTransportWork)0), post_transport_work((PostTransportWork)0),
midi_requests (16),
_send_smpte_update (false), _send_smpte_update (false),
midi_requests (16),
diskstreams (new DiskstreamList), diskstreams (new DiskstreamList),
routes (new RouteList), routes (new RouteList),
_bundle_xml_node (0), _bundle_xml_node (0),

1
libs/ardour/smf_reader.cc
View file

@ -17,6 +17,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <cstring>
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
#include <iostream> #include <iostream>

1
libs/ardour/sndfilesource.cc
View file

@ -17,6 +17,7 @@
*/ */
#include <cstring>
#include <cerrno> #include <cerrno>
#include <climits> #include <climits>

1
libs/ardour/utils.cc
View file

@ -21,6 +21,7 @@
#include <stdint.h> #include <stdint.h>
#include <cstdio> /* for sprintf */ #include <cstdio> /* for sprintf */
#include <cstring>
#include <cmath> #include <cmath>
#include <cctype> #include <cctype>
#include <string> #include <string>

2
libs/clearlooks/clearlooks_style.c
View file

@ -860,7 +860,7 @@ clearlooks_style_draw_box (DRAW_ARGS)
} }
else if (DETAIL ("hseparator") || DETAIL ("vseparator")) else if (DETAIL ("hseparator") || DETAIL ("vseparator"))
{ {
gchar *new_detail = detail; const gchar *new_detail = detail;
/* Draw a normal separator, we just use this because it gives more control /* Draw a normal separator, we just use this because it gives more control
* over sizing (currently). */ * over sizing (currently). */

6
libs/gtkmm2ext/barcontroller.cc
View file

@ -149,7 +149,7 @@ BarController::button_release (GdkEventButton* ev)
} else { } else {
double scale; double scale;
if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
scale = 0.01; scale = 0.01;
} else if (ev->state & GDK_CONTROL_MASK) { } else if (ev->state & GDK_CONTROL_MASK) {
scale = 0.1; scale = 0.1;
@ -179,7 +179,7 @@ BarController::scroll (GdkEventScroll* ev)
{ {
double scale; double scale;
if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
scale = 0.01; scale = 0.01;
} else if (ev->state & GDK_CONTROL_MASK) { } else if (ev->state & GDK_CONTROL_MASK) {
scale = 0.1; scale = 0.1;
@ -215,7 +215,7 @@ BarController::motion (GdkEventMotion* ev)
return TRUE; return TRUE;
} }
if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
scale = 0.01; scale = 0.01;
} else if (ev->state & GDK_CONTROL_MASK) { } else if (ev->state & GDK_CONTROL_MASK) {
scale = 0.1; scale = 0.1;

3
libs/midi++2/fd_midiport.cc
View file

@ -20,6 +20,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <cerrno> #include <cerrno>
#include <cstring>
#include <pbd/error.h> #include <pbd/error.h>
#include <pbd/pathscanner.h> #include <pbd/pathscanner.h>
@ -65,7 +66,7 @@ FD_MidiPort::FD_MidiPort (const XMLNode& node,
midi_filename_pattern = new string (pattern); midi_filename_pattern = new string (pattern);
} }
if (desc.mode & O_NONBLOCK == 0) { if ((desc.mode & O_NONBLOCK) == 0) {
/* we unconditionally set O_NONBLOCK during /* we unconditionally set O_NONBLOCK during
open, but the request didn't ask for it, open, but the request didn't ask for it,
so remove it. so remove it.

1
libs/midi++2/midi.cc
View file

@ -18,6 +18,7 @@
$Id$ $Id$
*/ */
#include <cstring>
#include <string> #include <string>
#include <cstdlib> #include <cstdlib>
#include <midi++/types.h> #include <midi++/types.h>

1
libs/midi++2/midichannel.cc
View file

@ -18,6 +18,7 @@
$Id$ $Id$
*/ */
#include <cstring>
#include <midi++/types.h> #include <midi++/types.h>
#include <midi++/port.h> #include <midi++/port.h>
#include <midi++/channel.h> #include <midi++/channel.h>

1
libs/midi++2/midiparser.cc
View file

@ -21,6 +21,7 @@
$Id$ $Id$
*/ */
#include <cstring>
#include <cstdlib> #include <cstdlib>
#include <unistd.h> #include <unistd.h>
#include <string> #include <string>

1
libs/midi++2/mtc.cc
View file

@ -18,6 +18,7 @@
$Id$ $Id$
*/ */
#include <cstring>
#include <cstdlib> #include <cstdlib>
#include <unistd.h> #include <unistd.h>
#include <string> #include <string>

1
libs/pbd/base_ui.cc
View file

@ -17,6 +17,7 @@
*/ */
#include <cstring>
#include <stdint.h> #include <stdint.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>

5
libs/pbd/convert.cc
View file

@ -19,6 +19,7 @@
#include <cmath> #include <cmath>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h>
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#endif #endif
@ -101,13 +102,13 @@ short_version (string orig, string::size_type target_length)
int int
atoi (const string& s) atoi (const string& s)
{ {
return std::atoi (s.c_str()); return ::atoi (s.c_str());
} }
double double
atof (const string& s) atof (const string& s)
{ {
return std::atof (s.c_str()); return ::atof (s.c_str());
} }
vector<string> vector<string>

1
libs/pbd/mountpoint.cc
View file

@ -19,6 +19,7 @@
*/ */
#include <cstdio> #include <cstdio>
#include <cstring>
#include <string> #include <string>
#include <limits.h> #include <limits.h>

1
libs/pbd/pathscanner.cc
View file

@ -18,6 +18,7 @@
$Id$ $Id$
*/ */
#include <cstring>
#include <cstdlib> #include <cstdlib>
#include <cstdio> #include <cstdio>
#include <vector> #include <vector>

1
libs/pbd/pbd/ringbuffer.h
View file

@ -20,6 +20,7 @@
#ifndef ringbuffer_h #ifndef ringbuffer_h
#define ringbuffer_h #define ringbuffer_h
#include <cstring>
#include <glib.h> #include <glib.h>
template<class T> template<class T>

1
libs/pbd/pool.cc
View file

@ -18,6 +18,7 @@
$Id$ $Id$
*/ */
#include <cstdlib>
#include <iostream> #include <iostream>
#include <vector> #include <vector>

2
libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp
View file

@ -34,6 +34,8 @@
authorization. authorization.
*/ */
#include <cstring>
#include <cstdlib>
#include "PluginAdapter.h" #include "PluginAdapter.h"
//#define DEBUG_PLUGIN_ADAPTER 1 //#define DEBUG_PLUGIN_ADAPTER 1

1
libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp
View file

@ -34,6 +34,7 @@
authorization. authorization.
*/ */
#include <stdlib.h>
#include "PluginHostAdapter.h" #include "PluginHostAdapter.h"
namespace Vamp namespace Vamp

1
libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp
View file

@ -42,6 +42,7 @@
#include <fstream> #include <fstream>
#include <cctype> // tolower #include <cctype> // tolower
#include <cstring>
#ifdef _WIN32 #ifdef _WIN32