diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/editor_routes.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/audioengine.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_buffer.h | 2 | ||||
| -rw-r--r-- | libs/ardour/midi_buffer.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/midi_ring_buffer.cc | 8 | ||||
| -rw-r--r-- | libs/backends/wavesaudio/waves_audiobackend.cc | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 4141bd720b..3b385ef292 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3601,13 +3601,13 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg) continue; } #ifndef PLATFORM_WINDOWS - if ( (!g_lstat (icsd_exec.c_str(), &sb) == 0) + if ( (g_lstat (icsd_exec.c_str(), &sb) != 0) || (sb.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) == 0 ) { warning << _("Given Video Server is not an executable file.") << endmsg; continue; } #else - if ( (!g_lstat (icsd_exec.c_str(), &sb) == 0) + if ( (g_lstat (icsd_exec.c_str(), &sb) != 0) || (sb.st_mode & (S_IXUSR)) == 0 ) { warning << _("Given Video Server is not an executable file.") << endmsg; continue; diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index e066e721fe..10b1cc894d 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -810,7 +810,7 @@ EditorRoutes::update_visibility () TreeModel::Children rows = _model->children(); TreeModel::Children::iterator i; - DisplaySuspender ds (); + DisplaySuspender ds; for (i = rows.begin(); i != rows.end(); ++i) { TimeAxisView *tv = (*i)[_columns.tv]; diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 181cfd1a97..3bc95b37be 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -55,7 +55,7 @@ class Port; class Session; class ProcessThread; class AudioBackend; -class AudioBackendInfo; +struct AudioBackendInfo; class LIBARDOUR_API AudioEngine : public SessionHandlePtr, public PortManager { diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h index 2e2cbf6504..6571924bef 100644 --- a/libs/ardour/ardour/midi_buffer.h +++ b/libs/ardour/ardour/midi_buffer.h @@ -87,7 +87,7 @@ public: int event_size = Evoral::midi_event_size(ev_start); assert(event_size >= 0); return EventType(EventTypeMap::instance().midi_event_type(*ev_start), - *((TimeType*)(buffer->_data + offset)), + *(reinterpret_cast<TimeType*>((uintptr_t)(buffer->_data + offset))), event_size, ev_start); } diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc index 4715be928c..7f79262b2f 100644 --- a/libs/ardour/midi_buffer.cc +++ b/libs/ardour/midi_buffer.cc @@ -190,7 +190,7 @@ MidiBuffer::push_back(TimeType time, size_t size, const uint8_t* data) } uint8_t* const write_loc = _data + _size; - *((TimeType*)write_loc) = time; + *(reinterpret_cast<TimeType*>((uintptr_t)write_loc)) = time; memcpy(write_loc + stamp_size, data, size); _size += stamp_size + size; @@ -242,7 +242,7 @@ MidiBuffer::insert_event(const Evoral::MIDIEvent<TimeType>& ev) } uint8_t* const write_loc = _data + insert_offset; - *((TimeType*)write_loc) = t; + *(reinterpret_cast<TimeType*>((uintptr_t)write_loc)) = t; memcpy(write_loc + stamp_size, ev.buffer(), ev.size()); _size += bytes_to_merge; @@ -267,7 +267,7 @@ MidiBuffer::reserve(TimeType time, size_t size) // write timestamp uint8_t* write_loc = _data + _size; - *((TimeType*)write_loc) = time; + *(reinterpret_cast<TimeType*>((uintptr_t)write_loc)) = time; // move write_loc to begin of MIDI buffer data to write to write_loc += stamp_size; diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc index e4ae3f3ffe..555ac6fb96 100644 --- a/libs/ardour/midi_ring_buffer.cc +++ b/libs/ardour/midi_ring_buffer.cc @@ -57,8 +57,8 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame */ this->peek (peekbuf, prefix_size); - ev_time = *((T*) peekbuf); - ev_size = *((uint32_t*)(peekbuf + sizeof(T) + sizeof (Evoral::EventType))); + ev_time = *(reinterpret_cast<T*>((uintptr_t)peekbuf)); + ev_size = *(reinterpret_cast<uint32_t*>((uintptr_t)(peekbuf + sizeof(T) + sizeof (Evoral::EventType)))); if (ev_time >= end) { DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 past end @ %2\n", ev_time, end)); @@ -148,13 +148,13 @@ MidiRingBuffer<T>::flush (framepos_t /*start*/, framepos_t end) */ assert (success); - ev_time = *((T*) peekbuf); + ev_time = *(reinterpret_cast<T*>((uintptr_t)peekbuf)); if (ev_time >= end) { break; } - ev_size = *((uint32_t*)(peekbuf + sizeof(T) + sizeof (Evoral::EventType))); + ev_size = *(reinterpret_cast<uint32_t*>((uintptr_t)(peekbuf + sizeof(T) + sizeof (Evoral::EventType)))); this->increment_read_ptr (prefix_size); this->increment_read_ptr (ev_size); } diff --git a/libs/backends/wavesaudio/waves_audiobackend.cc b/libs/backends/wavesaudio/waves_audiobackend.cc index f7f3bee985..8dbd4fb68c 100644 --- a/libs/backends/wavesaudio/waves_audiobackend.cc +++ b/libs/backends/wavesaudio/waves_audiobackend.cc @@ -117,8 +117,8 @@ WavesAudioBackend::WavesAudioBackend (AudioEngine& e) , _sample_time_at_cycle_start (0) , _freewheeling (false) , _freewheel_thread_active (false) - , _audio_cycle_period_nanos (0) , _dsp_load_accumulator (0) + , _audio_cycle_period_nanos (0) , _dsp_load_history_length(0) { } |