Conversation
All the server-specific classes are now in the deflect::server namespace.
7811b88 to
95cfe8c
Compare
| //@{ | ||
| uint32_t width = 0u; /**< The width in pixels. */ | ||
| uint32_t height = 0u; /**< The height in pixels. */ | ||
| //@} |
There was a problem hiding this comment.
those four and the data type is a repetition from the segment parameters. reuse them here?
There was a problem hiding this comment.
This is a tricky point. The existing structs Segment and SegementParameters are shared between Deflect and DeflectServer because they are part of the networking protocol. However, they were also part of the public DeflectServer API because they were exposed through the Frame object. The problem was that DeflectServer depends on Deflect, so the shared classes should logically be in Deflect, but the headers have no reason to be public in Deflect because they are not used by client code. In the end I decided to keep the legacy structs private in Deflect and introduce this new Tile struct for use in Frame in DeflectServer that combines the two. It's nicer to use without the nested SegementParameters object and the public API can evolve separately from the networking API, at the cost of some duplication.
deflect/types.h
Outdated
| /** The possible formats for image data. */ | ||
| enum class Format : std::uint8_t | ||
| { | ||
| rgba = 0, // equivalent to old compressed=false property |
There was a problem hiding this comment.
with 1.0, maybe those references to old things are no longer needed to be mentioned
There was a problem hiding this comment.
You're right, it probably doesn't serve a purpose anymore. Anyone changing this enum will break the network protocol, but that's true of all the other enums as well, so no reason to mark those two as "special".
deflect/server/CMakeLists.txt
Outdated
| ) | ||
|
|
||
| set(DEFLECTSERVER_LINK_LIBRARIES | ||
| PUBLIC Deflect Qt5::Core Qt5::Network |
There was a problem hiding this comment.
Because Server : public QTcpServer. It probably wouldn't be too hard to hide it in the future.
deflect/types.h
Outdated
|
|
||
| using Segments = std::vector<Segment>; | ||
|
|
||
| namespace server |
There was a problem hiding this comment.
move them to a separate server/types.h?
There was a problem hiding this comment.
OK, will do, also for qt/types.h then.
| * [194](https://github.com/BlueBrain/Deflect/pull/194): | ||
| Reset API versionning to 1.0, remove deprecated functions (Stream::asyncSend, | ||
| ImageWrapper::swapYAxis). | ||
| ImageWrapper::swapYAxis). Moved all server-specific classes to a separate |
There was a problem hiding this comment.
that change is not part of 194?!
|
|
||
| cmake_minimum_required(VERSION 3.1 FATAL_ERROR) | ||
| project(Deflect VERSION 0.14.1) | ||
| project(Deflect VERSION 1.0.0) |
| @@ -1,200 +0,0 @@ | |||
| /*********************************************************************/ | |||
There was a problem hiding this comment.
? haven't seen this file ever? wow
There was a problem hiding this comment.
I found it by accident, it had been forgotten since 2013...!
doc/Changelog.md
Outdated
|
|
||
| ### 1.0.0 (git master) | ||
| * [194](https://github.com/BlueBrain/Deflect/pull/194): | ||
| Reset API versionning to 1.0, remove deprecated functions (Stream::asyncSend, |
There was a problem hiding this comment.
one 'n' too much in versioning
|
Damn, two unit tests just failed in "closeAndReopenStreamWithObserverStayingAliveAndRendering" with a failed assert(!frame->tiles.empty()); but I can't reproduce it locally, must be a nasty timing issue... |
|
retest this please |
1 similar comment
|
retest this please |
No description provided.