Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
46d740aa
Commit
46d740aa
authored
Dec 23, 2015
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
Dec 23, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chromecast: processMessage() doesn't need to return a value
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
a5c81256
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
12 deletions
+2
-12
modules/stream_out/chromecast/chromecast.h
modules/stream_out/chromecast/chromecast.h
+1
-1
modules/stream_out/chromecast/chromecast_ctrl.cpp
modules/stream_out/chromecast/chromecast_ctrl.cpp
+1
-11
No files found.
modules/stream_out/chromecast/chromecast.h
View file @
46d740aa
...
...
@@ -85,7 +85,7 @@ struct intf_sys_t
std
::
queue
<
castchannel
::
CastMessage
>
messagesToSend
;
unsigned
i_requestId
;
int
processMessage
(
const
castchannel
::
CastMessage
&
msg
);
void
processMessage
(
const
castchannel
::
CastMessage
&
msg
);
};
#endif
/* VLC_CHROMECAST_H */
modules/stream_out/chromecast/chromecast_ctrl.cpp
View file @
46d740aa
...
...
@@ -91,9 +91,8 @@ intf_sys_t::~intf_sys_t()
* @param msg the CastMessage to process
* @return 0 if the message has been successfuly processed else -1
*/
int
intf_sys_t
::
processMessage
(
const
castchannel
::
CastMessage
&
msg
)
void
intf_sys_t
::
processMessage
(
const
castchannel
::
CastMessage
&
msg
)
{
int
i_ret
=
0
;
std
::
string
namespace_
=
msg
.
namespace_
();
if
(
namespace_
==
NAMESPACE_DEVICEAUTH
)
...
...
@@ -104,12 +103,10 @@ int intf_sys_t::processMessage(const castchannel::CastMessage &msg)
if
(
authMessage
.
has_error
())
{
msg_Err
(
p_stream
,
"Authentification error: %d"
,
authMessage
.
error
().
error_type
());
i_ret
=
-
1
;
}
else
if
(
!
authMessage
.
has_response
())
{
msg_Err
(
p_stream
,
"Authentification message has no response field"
);
i_ret
=
-
1
;
}
else
{
...
...
@@ -136,7 +133,6 @@ int intf_sys_t::processMessage(const castchannel::CastMessage &msg)
else
{
msg_Err
(
p_stream
,
"Heartbeat command not supported: %s"
,
type
.
c_str
());
i_ret
=
-
1
;
}
json_value_free
(
p_data
);
...
...
@@ -198,7 +194,6 @@ int intf_sys_t::processMessage(const castchannel::CastMessage &msg)
{
msg_Err
(
p_stream
,
"Receiver command not supported: %s"
,
msg
.
payload_utf8
().
c_str
());
i_ret
=
-
1
;
}
json_value_free
(
p_data
);
...
...
@@ -226,7 +221,6 @@ int intf_sys_t::processMessage(const castchannel::CastMessage &msg)
{
msg_Err
(
p_stream
,
"Media command not supported: %s"
,
msg
.
payload_utf8
().
c_str
());
i_ret
=
-
1
;
}
json_value_free
(
p_data
);
...
...
@@ -248,16 +242,12 @@ int intf_sys_t::processMessage(const castchannel::CastMessage &msg)
{
msg_Err
(
p_stream
,
"Connection command not supported: %s"
,
type
.
c_str
());
i_ret
=
-
1
;
}
}
else
{
msg_Err
(
p_stream
,
"Unknown namespace: %s"
,
msg
.
namespace_
().
c_str
());
i_ret
=
-
1
;
}
return
i_ret
;
}
/*****************************************************************************
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment