Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[core] changed shm preprocessor define usage #1485

Merged
merged 1 commit into from
Mar 22, 2024
Merged

[core] changed shm preprocessor define usage #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ecal/core/src/registration/ecal_registration_provider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,10 @@ namespace eCAL
// send single registration sample over udp
SendSample2UDP(sample_);

#if ECAL_CORE_REGISTRATION_SHM
// broadcast (updated) sample list over shm
SendSampleList2SHM();
#endif
}

return(true);
Expand Down Expand Up @@ -221,11 +223,11 @@ namespace eCAL
return return_value;
}

#if ECAL_CORE_REGISTRATION_SHM
bool CRegistrationProvider::SendSampleList2SHM()
{
if (!m_created) return(false);

#if ECAL_CORE_REGISTRATION_SHM
bool return_value{ true };

// send sample list over shm
Expand All @@ -245,10 +247,8 @@ namespace eCAL
}
}
return return_value;
#else
return false;
#endif
}
#endif

void CRegistrationProvider::ClearSampleList()
{
Expand Down Expand Up @@ -281,8 +281,10 @@ namespace eCAL
// send out sample list over udp
SendSampleList2UDP();

#if ECAL_CORE_REGISTRATION_SHM
// broadcast sample list over shm
SendSampleList2SHM();
#endif

// clear registration sample list
ClearSampleList();
Expand Down
2 changes: 2 additions & 0 deletions ecal/core/src/registration/ecal_registration_provider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ namespace eCAL
bool SendSample2UDP(const Registration::Sample& sample_);

bool SendSampleList2UDP();
#if ECAL_CORE_REGISTRATION_SHM
bool SendSampleList2SHM();
#endif
void ClearSampleList();

void RegisterSendThread();
Expand Down
Loading