Browse Source

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 <external.adam.miartus@de.bosch.com>
pull/597/head
Adam Miartus Timo Wischer 6 years ago
parent
commit
f2b9aa4104
3 changed files with 97 additions and 63 deletions
  1. +6
    -4
      common/JackAPI.cpp
  2. +69
    -45
      common/JackLibAPI.cpp
  3. +22
    -14
      common/JackMidiUtil.cpp

+ 6
- 4
common/JackAPI.cpp View File

@@ -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) 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, LIB_EXPORT int jack_client_create_thread(jack_client_t* client,


+ 69
- 45
common/JackLibAPI.cpp View File

@@ -229,93 +229,117 @@ LIB_EXPORT int jack_set_property(jack_client_t* ext_client, jack_uuid_t subject,
{ {
JackGlobals::CheckContext("jack_set_property"); 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) LIB_EXPORT int jack_get_property(jack_uuid_t subject, const char* key, char** value, char** type)
{ {
JackGlobals::CheckContext("jack_get_property"); 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) LIB_EXPORT void jack_free_description(jack_description_t* desc, int free_actual_description_too)
{ {
JackGlobals::CheckContext("jack_free_description"); 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) LIB_EXPORT int jack_get_properties(jack_uuid_t subject, jack_description_t* desc)
{ {
JackGlobals::CheckContext("jack_get_properties"); 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) LIB_EXPORT int jack_get_all_properties(jack_description_t** descriptions)
{ {
JackGlobals::CheckContext("jack_get_all_properties"); 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) LIB_EXPORT int jack_remove_property(jack_client_t* ext_client, jack_uuid_t subject, const char* key)
{ {
JackGlobals::CheckContext("jack_remove_property"); 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) LIB_EXPORT int jack_remove_properties(jack_client_t* ext_client, jack_uuid_t subject)
{ {
JackGlobals::CheckContext("jack_remove_properties"); 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) LIB_EXPORT int jack_remove_all_properties(jack_client_t* ext_client)
{ {
JackGlobals::CheckContext("jack_remove_all_properties"); 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) LIB_EXPORT int jack_set_property_change_callback(jack_client_t* ext_client, JackPropertyChangeCallback callback, void* arg)


+ 22
- 14
common/JackMidiUtil.cpp View File

@@ -55,26 +55,32 @@ Jack::ApplyRunningStatus(jack_midi_event_t *event,
jack_nframes_t jack_nframes_t
Jack::GetCurrentFrame() 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_nframes_t
Jack::GetFramesFromTime(jack_time_t time) 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_nframes_t
Jack::GetLastFrame() Jack::GetLastFrame()
{ {
return GetEngineControl()->fFrameTimer.ReadCurrentState()->CurFrame();
jack_error("Jack::GetLastFrame is not implemented");
abort();
// return GetEngineControl()->fFrameTimer.ReadCurrentState()->CurFrame();
} }


int int
@@ -114,8 +120,10 @@ Jack::GetMessageLength(jack_midi_data_t status_byte)
jack_time_t jack_time_t
Jack::GetTimeFromFrames(jack_nframes_t frames) 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);
} }

Loading…
Cancel
Save