Skip to content

Commit

Permalink
Removed make files from, OCALiteDante runs on windows, OCA_BNKII on u…
Browse files Browse the repository at this point in the history
…Blaze target.

Re-shuffeld some files to make the dependecies a bit cleaner.
Checked/Fixed compilation on uBlaze (or OCA_BKNII) and windows (OCALiteDante/OCALite)
  • Loading branch information
tljdebrouwer committed Dec 30, 2017
1 parent b6e1e0c commit 54e1067
Show file tree
Hide file tree
Showing 16 changed files with 425 additions and 737 deletions.
1 change: 0 additions & 1 deletion OCAMicro/OCAMicro/OCAMicro.sln
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Global
{6647BA68-ABF1-44DC-B10A-B1C14DDC460D}.Release|Win32.Build.0 = Release|Win32
{34C33AF7-9D4B-4A41-8511-6B9919F58132}.Debug|Win32.ActiveCfg = Debug|Win32
{34C33AF7-9D4B-4A41-8511-6B9919F58132}.Release|Win32.ActiveCfg = Release|Win32
{34C33AF7-9D4B-4A41-8511-6B9919F58132}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
8 changes: 7 additions & 1 deletion OCAMicro/OCAMicro/Src/app/OCALiteDante/DanteLiteConMon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ static void DanteLiteStatusMessageCallback(conmon_client_t * client, conmon_chan
uint16_t aud_type = conmon_audinate_message_get_type(body);
const char *device_name = conmon_client_device_name_for_instance_id(client, &id);
// check the message is a status message for us
if(0 != strcmp(DanteCMControlledDeviceName, device_name)) {
if((!device_name) || (0 != strcmp(DanteCMControlledDeviceName, device_name))) {
return;
}
switch(aud_type) {
Expand All @@ -678,6 +678,11 @@ static void DanteLiteStatusMessageCallback(conmon_client_t * client, conmon_chan
case CONMON_AUDINATE_MESSAGE_TYPE_RX_FLOW_CHANGE:
DanteLiteHostInterfaceRouterMarkComponentStale(DR_DEVICE_COMPONENT_RXFLOWS);
break;
#ifndef BKN_1
case CONMON_AUDINATE_MESSAGE_TYPE_LOCK_STATUS:
DanteLiteHandleLockStatus(body);
break;
#endif // BKN_1
default:
deviceConMonDump && printf("DanteLiteStatusMessageCallback: Audinate msg (local): %d\n", aud_type);
break;
Expand Down Expand Up @@ -1067,6 +1072,7 @@ int DanteCMSendVendorMessage(conmon_message_body_t *msg, uint32_t size, const co
void DanteCMForceUpdate(void)
{
aud_utime_t connectWait, currentTime;

int loops = 2;
while(loops) {
DanteLiteHostInterfaceRun();
Expand Down
Loading

0 comments on commit 54e1067

Please sign in to comment.