summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-05-01 21:16:31 +0000
committerDavid Robillard <d@drobilla.net>2008-05-01 21:16:31 +0000
commit511114a36510db5d1e55261fd07c8a4bc0f705b8 (patch)
treee134a6a4f7d054bd1d808b3442b9450487f3a803
parentc4145c33c0734ef39c8fa29affda567c36b3f4b3 (diff)
downloadingen-511114a36510db5d1e55261fd07c8a4bc0f705b8.tar.gz
ingen-511114a36510db5d1e55261fd07c8a4bc0f705b8.tar.bz2
ingen-511114a36510db5d1e55261fd07c8a4bc0f705b8.zip
GCC 4.3 fixes.
git-svn-id: http://svn.drobilla.net/lad/ingen@1191 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/libs/engine/JackAudioDriver.hpp4
-rw-r--r--src/libs/engine/LV2Info.cpp5
-rw-r--r--src/libs/engine/OSCClientSender.hpp2
-rw-r--r--src/libs/engine/events/CreatePortEvent.cpp3
4 files changed, 8 insertions, 6 deletions
diff --git a/src/libs/engine/JackAudioDriver.hpp b/src/libs/engine/JackAudioDriver.hpp
index 82d07f16..f436f795 100644
--- a/src/libs/engine/JackAudioDriver.hpp
+++ b/src/libs/engine/JackAudioDriver.hpp
@@ -98,8 +98,8 @@ public:
/** Transport state for this frame.
* Intended to only be called from the audio thread. */
- inline const jack_position_t* position() { return &_position; }
- inline const jack_transport_state_t transport_state() { return _transport_state; }
+ inline const jack_position_t* position() { return &_position; }
+ inline jack_transport_state_t transport_state() { return _transport_state; }
bool is_realtime() const { return jack_is_realtime(_client); }
diff --git a/src/libs/engine/LV2Info.cpp b/src/libs/engine/LV2Info.cpp
index 43d87d24..df8dd1f9 100644
--- a/src/libs/engine/LV2Info.cpp
+++ b/src/libs/engine/LV2Info.cpp
@@ -95,8 +95,9 @@ LV2Info::uri_map_uri_to_id(LV2_URI_Map_Callback_Data callback_data,
uint32_t
LV2Info::event_ref(LV2_Event_Callback_Data callback_data,
- LV2_Event* event) {
-
+ LV2_Event* event)
+{
+ return 0;
}
diff --git a/src/libs/engine/OSCClientSender.hpp b/src/libs/engine/OSCClientSender.hpp
index 4644b684..d6a25fd2 100644
--- a/src/libs/engine/OSCClientSender.hpp
+++ b/src/libs/engine/OSCClientSender.hpp
@@ -51,7 +51,7 @@ public:
virtual ~OSCClientSender()
{ lo_address_free(_address); }
- const lo_address address() const { return _address; }
+ lo_address address() const { return _address; }
void subscribe(Shared::EngineInterface* engine) { }
diff --git a/src/libs/engine/events/CreatePortEvent.cpp b/src/libs/engine/events/CreatePortEvent.cpp
index 3cdda4d1..7c7d671b 100644
--- a/src/libs/engine/events/CreatePortEvent.cpp
+++ b/src/libs/engine/events/CreatePortEvent.cpp
@@ -142,13 +142,14 @@ CreatePortEvent::execute(ProcessContext& context)
_patch->external_ports(_ports_array);
}
- if (_driver_port)
+ if (_driver_port) {
if (_type == "ingen:AudioPort")
_engine.audio_driver()->add_port(_driver_port);
else if (_type == "ingen:MIDIPort")
_engine.midi_driver()->add_port(_driver_port);
else if (_type == "ingen:OSCPort")
cerr << "OSC DRIVER PORT" << endl;
+ }
if (_source)
_source->unblock();