From f2b9aa410464409d5bb87f752cc1d2d5259b8c11 Mon Sep 17 00:00:00 2001 From: Adam Miartus Date: Fri, 31 Jan 2020 10:04:51 +0100 Subject: [PATCH] Workaround: Disable not yet supported APIs metadata: problem here is that we don't have knowledge of the server, each server is supposed to have its own metadata instance as can be seen in Metadata implementation midi: does not have reference to global context Change-Id: I80fde1facde3eca40431464264afdf76a002c752 Signed-off-by: Adam Miartus --- common/JackAPI.cpp | 10 ++-- common/JackLibAPI.cpp | 114 ++++++++++++++++++++++++---------------- common/JackMidiUtil.cpp | 36 ++++++++----- 3 files changed, 97 insertions(+), 63 deletions(-) diff --git a/common/JackAPI.cpp b/common/JackAPI.cpp index 7a307f7b..c97f2263 100644 --- a/common/JackAPI.cpp +++ b/common/JackAPI.cpp @@ -1699,10 +1699,12 @@ LIB_EXPORT int jack_client_max_real_time_priority(jack_client_t* ext_client) LIB_EXPORT int jack_acquire_real_time_scheduling(jack_native_thread_t thread, int priority) { - JackEngineControl* control = GetEngineControl(); - return (control - ? JackThread::AcquireRealTimeImp(thread, priority, control->fPeriod, control->fComputation, control->fConstraint) - : -1); + jack_error("jack_acquire_real_time_scheduling is not implemented"); + abort(); +// JackEngineControl* control = GetEngineControl(); +// return (control +// ? JackThread::AcquireRealTimeImp(thread, priority, control->fPeriod, control->fComputation, control->fConstraint) +// : -1); } LIB_EXPORT int jack_client_create_thread(jack_client_t* client, diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp index e439f473..b7bb9776 100644 --- a/common/JackLibAPI.cpp +++ b/common/JackLibAPI.cpp @@ -229,93 +229,117 @@ LIB_EXPORT int jack_set_property(jack_client_t* ext_client, jack_uuid_t subject, { JackGlobals::CheckContext("jack_set_property"); - JackClient* client = (JackClient*)ext_client; - jack_log("jack_set_property ext_client %x client %x ", ext_client, client); - if (client == NULL) { - jack_error("jack_set_property called with a NULL client"); - return -1; - } else { - JackMetadata* metadata = GetMetadata(); - return (metadata ? metadata->SetProperty(client, subject, key, value, type) : -1); - } + jack_error("jack_set_property is not implemented"); + return -1; + +// JackClient* client = (JackClient*)ext_client; +// jack_log("jack_set_property ext_client %x client %x ", ext_client, client); +// if (client == NULL) { +// jack_error("jack_set_property called with a NULL client"); +// return -1; +// } else { +// JackMetadata* metadata = GetMetadata(); +// return (metadata ? metadata->SetProperty(client, subject, key, value, type) : -1); +// } } LIB_EXPORT int jack_get_property(jack_uuid_t subject, const char* key, char** value, char** type) { JackGlobals::CheckContext("jack_get_property"); - JackMetadata* metadata = GetMetadata(); - return (metadata ? metadata->GetProperty(subject, key, value, type) : -1); + jack_error("jack_get_property is not implemented"); + return -1; + +// JackMetadata* metadata = GetMetadata(); +// return (metadata ? metadata->GetProperty(subject, key, value, type) : -1); } LIB_EXPORT void jack_free_description(jack_description_t* desc, int free_actual_description_too) { JackGlobals::CheckContext("jack_free_description"); - JackMetadata* metadata = GetMetadata(); - if (metadata) - metadata->FreeDescription(desc, free_actual_description_too); + jack_error("jack_free_description is not implemented"); + return; + +// JackMetadata* metadata = GetMetadata(); +// if (metadata) +// metadata->FreeDescription(desc, free_actual_description_too); } LIB_EXPORT int jack_get_properties(jack_uuid_t subject, jack_description_t* desc) { JackGlobals::CheckContext("jack_get_properties"); - JackMetadata* metadata = GetMetadata(); - return (metadata ? metadata->GetProperties(subject, desc) : -1); + jack_error("jack_get_properties is not implemented"); + return -1; + +// JackMetadata* metadata = GetMetadata(); +// return (metadata ? metadata->GetProperties(subject, desc) : -1); } LIB_EXPORT int jack_get_all_properties(jack_description_t** descriptions) { JackGlobals::CheckContext("jack_get_all_properties"); - JackMetadata* metadata = GetMetadata(); - return (metadata ? metadata->GetAllProperties(descriptions) : -1); + jack_error("jack_get_all_properties is not implemented"); + return -1; + +// JackMetadata* metadata = GetMetadata(); +// return (metadata ? metadata->GetAllProperties(descriptions) : -1); } LIB_EXPORT int jack_remove_property(jack_client_t* ext_client, jack_uuid_t subject, const char* key) { JackGlobals::CheckContext("jack_remove_property"); - JackClient* client = (JackClient*)ext_client; - jack_log("jack_remove_property ext_client %x client %x ", ext_client, client); - if (client == NULL) { - jack_error("jack_remove_property called with a NULL client"); - return -1; - } else { - JackMetadata* metadata = GetMetadata(); - return (metadata ? metadata->RemoveProperty(client, subject, key) : -1); - } + jack_error("jack_remove_property is not implemented"); + return -1; + +// JackClient* client = (JackClient*)ext_client; +// jack_log("jack_remove_property ext_client %x client %x ", ext_client, client); +// if (client == NULL) { +// jack_error("jack_remove_property called with a NULL client"); +// return -1; +// } else { +// JackMetadata* metadata = GetMetadata(); +// return (metadata ? metadata->RemoveProperty(client, subject, key) : -1); +// } } LIB_EXPORT int jack_remove_properties(jack_client_t* ext_client, jack_uuid_t subject) { JackGlobals::CheckContext("jack_remove_properties"); - JackClient* client = (JackClient*)ext_client; - jack_log("jack_remove_properties ext_client %x client %x ", ext_client, client); - if (client == NULL) { - jack_error("jack_remove_properties called with a NULL client"); - return -1; - } else { - JackMetadata* metadata = GetMetadata(); - return (metadata ? metadata->RemoveProperties(client, subject) : -1); - } + jack_error("jack_remove_properties is not implemented"); + return -1; + +// JackClient* client = (JackClient*)ext_client; +// jack_log("jack_remove_properties ext_client %x client %x ", ext_client, client); +// if (client == NULL) { +// jack_error("jack_remove_properties called with a NULL client"); +// return -1; +// } else { +// JackMetadata* metadata = GetMetadata(); +// return (metadata ? metadata->RemoveProperties(client, subject) : -1); +// } } LIB_EXPORT int jack_remove_all_properties(jack_client_t* ext_client) { JackGlobals::CheckContext("jack_remove_all_properties"); - JackClient* client = (JackClient*)ext_client; - jack_log("jack_remove_all_properties ext_client %x client %x ", ext_client, client); - if (client == NULL) { - jack_error("jack_remove_all_properties called with a NULL client"); - return -1; - } else { - JackMetadata* metadata = GetMetadata(); - return (metadata ? metadata->RemoveAllProperties(client) : -1); - } + jack_error("jack_remove_all_properties is not implemented"); + return -1; + +// JackClient* client = (JackClient*)ext_client; +// jack_log("jack_remove_all_properties ext_client %x client %x ", ext_client, client); +// if (client == NULL) { +// jack_error("jack_remove_all_properties called with a NULL client"); +// return -1; +// } else { +// JackMetadata* metadata = GetMetadata(); +// return (metadata ? metadata->RemoveAllProperties(client) : -1); +// } } LIB_EXPORT int jack_set_property_change_callback(jack_client_t* ext_client, JackPropertyChangeCallback callback, void* arg) diff --git a/common/JackMidiUtil.cpp b/common/JackMidiUtil.cpp index a0dc0bae..135258a8 100644 --- a/common/JackMidiUtil.cpp +++ b/common/JackMidiUtil.cpp @@ -55,26 +55,32 @@ Jack::ApplyRunningStatus(jack_midi_event_t *event, jack_nframes_t Jack::GetCurrentFrame() { - jack_time_t time = GetMicroSeconds(); - JackEngineControl *control = GetEngineControl(); - JackTimer timer; - control->ReadFrameTime(&timer); - return timer.Time2Frames(time, control->fBufferSize); + jack_error("Jack::GetCurrentFrame is not implemented"); + abort(); +// jack_time_t time = GetMicroSeconds(); +// JackEngineControl *control = GetEngineControl(); +// JackTimer timer; +// control->ReadFrameTime(&timer); +// return timer.Time2Frames(time, control->fBufferSize); } jack_nframes_t Jack::GetFramesFromTime(jack_time_t time) { - JackEngineControl* control = GetEngineControl(); - JackTimer timer; - control->ReadFrameTime(&timer); - return timer.Time2Frames(time, control->fBufferSize); + jack_error("Jack::GetFramesFromTime is not implemented"); + abort(); +// JackEngineControl* control = GetEngineControl(); +// JackTimer timer; +// control->ReadFrameTime(&timer); +// return timer.Time2Frames(time, control->fBufferSize); } jack_nframes_t Jack::GetLastFrame() { - return GetEngineControl()->fFrameTimer.ReadCurrentState()->CurFrame(); + jack_error("Jack::GetLastFrame is not implemented"); + abort(); +// return GetEngineControl()->fFrameTimer.ReadCurrentState()->CurFrame(); } int @@ -114,8 +120,10 @@ Jack::GetMessageLength(jack_midi_data_t status_byte) jack_time_t Jack::GetTimeFromFrames(jack_nframes_t frames) { - JackEngineControl* control = GetEngineControl(); - JackTimer timer; - control->ReadFrameTime(&timer); - return timer.Frames2Time(frames, control->fBufferSize); + jack_error("Jack::GetTimeFromFrames is not implemented"); + abort(); +// JackEngineControl* control = GetEngineControl(); +// JackTimer timer; +// control->ReadFrameTime(&timer); +// return timer.Frames2Time(frames, control->fBufferSize); }