| @@ -323,12 +323,12 @@ struct PhysicalTopologySource::Internal | |||
| std::min (sizeof (v.version), static_cast<size_t> (v.length))); | |||
| } | |||
| static juce::String getNameString (const BlocksProtocol::BlockName& n) | |||
| { | |||
| return juce::String (reinterpret_cast<const char*> (n.name), | |||
| std::min (sizeof (n.name), static_cast<size_t> (n.length))); | |||
| } | |||
| static juce::String getNameString (const BlocksProtocol::BlockName& n) | |||
| { | |||
| return juce::String (reinterpret_cast<const char*> (n.name), | |||
| std::min (sizeof (n.name), static_cast<size_t> (n.length))); | |||
| } | |||
| static Block::Timestamp deviceTimestampToHost (uint32 timestamp) noexcept | |||
| { | |||
| return static_cast<Block::Timestamp> (timestamp); | |||
| @@ -936,8 +936,8 @@ struct PhysicalTopologySource::Internal | |||
| { | |||
| auto currentBlock = currentTopology.blocks.getUnchecked (i); | |||
| auto newDeviceIter = std::find_if (newDeviceInfo.begin(), newDeviceInfo.end(), | |||
| [&] (DeviceInfo& info) { return info.uid == currentBlock->uid; }); | |||
| auto newDeviceIter = std::find_if (newDeviceInfo.begin(), newDeviceInfo.end(), | |||
| [&] (DeviceInfo& info) { return info.uid == currentBlock->uid; }); | |||
| if (newDeviceIter == newDeviceInfo.end()) | |||
| { | |||
| @@ -952,7 +952,7 @@ struct PhysicalTopologySource::Internal | |||
| } | |||
| } | |||
| static const int maxBlocksToSave = 100; | |||
| static const int maxBlocksToSave = 100; | |||
| if (disconnectedBlocks.size() > maxBlocksToSave) | |||
| disconnectedBlocks.removeRange (0, 2 * (disconnectedBlocks.size() - maxBlocksToSave)); | |||
| @@ -1219,22 +1219,22 @@ struct PhysicalTopologySource::Internal | |||
| if (disconnectedBlocks.getUnchecked (i)->uid == uid) | |||
| { | |||
| auto block = disconnectedBlocks.removeAndReturn (i); | |||
| if (auto blockImpl = BlockImplementation::getFrom (*block)) | |||
| { | |||
| if (auto blockImpl = BlockImplementation::getFrom (*block)) | |||
| { | |||
| blockImpl->revalidate (info.version, info.name, info.isMaster); | |||
| currentTopology.blocks.add (block); | |||
| return true; | |||
| return true; | |||
| } | |||
| } | |||
| } | |||
| } | |||
| return false; | |||
| } | |||
| void addNewBlock (DeviceInfo info) | |||
| { | |||
| currentTopology.blocks.add (new BlockImplementation (info.serial, *this, info.version, | |||
| currentTopology.blocks.add (new BlockImplementation (info.serial, *this, info.version, | |||
| info.name, info.isMaster)); | |||
| } | |||