[play] Separate Encoding and Type in Player application. #1836
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -763,6 +763,19 @@ std::string PlayThread::GetChannelType(const std::string& channel_name) | |||
| } | |||
| } | |||
|
|
|||
| std::string PlayThread::GetChannelEncoding(const std::string& channel_name) | |||
| { | |||
| std::shared_lock<std::shared_timed_mutex> measurement_lock(measurement_mutex_); | |||
There was a problem hiding this comment.
warning: variable 'measurement_lock' of type 'std::shared_lockstd::shared_timed_mutex' can be declared 'const' [misc-const-correctness]
Suggested change
| std::shared_lock<std::shared_timed_mutex> measurement_lock(measurement_mutex_); | |
| std::shared_lock<std::shared_timed_mutex> const measurement_lock(measurement_mutex_); |
| @@ -40,12 +40,13 @@ ChannelTreeItem::ChannelTreeItem(const QString& source_name) | |||
| , duration_(0) | |||
| {} | |||
|
|
|||
| ChannelTreeItem::ChannelTreeItem(const QString& source_name, const QString& channel_type, size_t total_channel_size, | |||
| ChannelTreeItem::ChannelTreeItem(const QString& source_name, const QString& channel_encoding, const QString& channel_type, size_t total_channel_size, | |||
There was a problem hiding this comment.
warning: no header providing "size_t" is directly included [misc-include-cleaner]
app/play/play_gui/src/widgets/models/channel_tree_item.cpp:18:
- #include <math.h>
+ #include <cstddef>
+ #include <math.h>| @@ -47,7 +48,7 @@ class ChannelTreeItem : public QAbstractTreeItem | |||
| }; | |||
|
|
|||
| ChannelTreeItem(const QString& source_name); | |||
| ChannelTreeItem(const QString& source_name, const QString& channel_type, size_t total_channel_size, | |||
| ChannelTreeItem(const QString& source_name, const QString& channel_encoding, const QString& channel_type, size_t total_channel_size, | |||
There was a problem hiding this comment.
warning: no header providing "size_t" is directly included [misc-include-cleaner]
app/play/play_gui/src/widgets/models/channel_tree_item.h:22:
+ #include <cstddef>| @@ -237,9 +237,10 @@ void ChannelTreeModel::reload() | |||
| double minTimestamp = QEcalPlay::instance()->minTimestampOfChannel(name); | |||
| double maxTimestamp = QEcalPlay::instance()->maxTimestampOfChannel(name); | |||
| std::string channel_type = QEcalPlay::instance()->channelType(name); | |||
| std::string channel_encoding = QEcalPlay::instance()->channelEncoding(name); | |||
There was a problem hiding this comment.
warning: variable 'channel_encoding' of type 'std::string' (aka 'basic_string') can be declared 'const' [misc-const-correctness]
Suggested change
| std::string channel_encoding = QEcalPlay::instance()->channelEncoding(name); | |
| std::string const channel_encoding = QEcalPlay::instance()->channelEncoding(name); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Relevant for #1832.