-
Notifications
You must be signed in to change notification settings - Fork 82
[R4_4][IMessageControl] Backporting #495
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.
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
Open
VeithMetro
wants to merge
5
commits into
R4_4
Choose a base branch
from
development/messaging-backporting
base: R4_4
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
424d773
Backport IMessageControl
VeithMetro 1191fa8
Remove legacy text comment from IMessageControl
VeithMetro f8db492
Bring back the old Controls method for backwards compatibility
VeithMetro 87e3c93
Merge branch 'development/messaging-backporting' of github.com:rdkcen…
VeithMetro 8861e01
Make sure the second Controls methods works on JSON-RPC
VeithMetro File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ | |
|
|
||
| #include "Module.h" | ||
|
|
||
| // @insert <core/MessageStore.h> | ||
| // @insert <com/IIteratorType.h> | ||
|
|
||
| namespace WPEFramework { | ||
|
|
@@ -31,14 +32,7 @@ namespace Exchange { | |
| struct EXTERNAL IMessageControl : virtual public Core::IUnknown { | ||
|
|
||
| enum { ID = ID_MESSAGE_CONTROL }; | ||
|
|
||
| enum messagetype : uint8_t { | ||
| TRACING = 1, | ||
| LOGGING = 2, | ||
| REPORTING = 3, | ||
| STANDARD_OUT = 4, | ||
| STANDARD_ERROR = 5 | ||
| }; | ||
| using messagetype = Core::Messaging::Metadata::type; | ||
|
|
||
| struct Control { | ||
| messagetype type /* @brief Type of message */; | ||
|
|
@@ -48,17 +42,25 @@ struct EXTERNAL IMessageControl : virtual public Core::IUnknown { | |
| }; | ||
|
|
||
| using IControlIterator = RPC::IIteratorType<Control, ID_MESSAGE_CONTROL_ITERATOR>; | ||
| using IStringIterator = RPC::IIteratorType<string, RPC::ID_STRINGITERATOR>; | ||
|
|
||
| // @brief Enables/disables a message control | ||
| // @param type Message type | ||
| // @param module Name of the module the message is originating from (e.g. Plugin_BluetoothControl) | ||
| // @param category Name of the message category (e.g. Information) | ||
| // @param enabled Denotes if control should be enabled (true) or disabled (false) | ||
| virtual uint32_t Enable(const messagetype type, const string& category, const string& module, const bool enabled) = 0; | ||
| // @param type: Message type | ||
| // @param module: Name of the module the message is originating from (e.g. Plugin_BluetoothControl) | ||
| // @param category: Name of the message category (e.g. Information) | ||
|
VeithMetro marked this conversation as resolved.
VeithMetro marked this conversation as resolved.
VeithMetro marked this conversation as resolved.
|
||
| // @param enabled: Denotes if control should be enabled (true) or disabled (false) | ||
| virtual Core::hresult Enable(const messagetype type, const string& category, const string& module, const bool enabled) = 0; | ||
|
|
||
| // @property | ||
| // @brief Retrieves a list of current message controls | ||
| virtual uint32_t Controls(IControlIterator*& control /* @out */) const = 0; | ||
| // @brief Retrieves a list of current message modules | ||
| virtual Core::hresult Modules(IStringIterator*& modules /* @out */) const = 0; | ||
|
|
||
| // @property | ||
| // @brief Retrieves a list of current message controls for a specific module | ||
| virtual Core::hresult Controls(const string& module /* @index @optional */, IControlIterator*& control /* @out */) const = 0; | ||
|
|
||
| // @json:omit | ||
| virtual Core::hresult Controls(IControlIterator*& controls) const = 0; | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @sebaszm we have
VeithMetro marked this conversation as resolved.
|
||
| }; | ||
|
|
||
| } // namespace Exchange | ||
|
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.