Skip to content

Commit e5d7c20

Browse files
committed
Fix format
Change-Id: I09654304368e4b6ba679d9ecf125d88ed21975c7
1 parent d237dfa commit e5d7c20

File tree

3 files changed

+29
-19
lines changed

3 files changed

+29
-19
lines changed

src/server/implementation/objects/MediaElementImpl.hpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,20 @@ class MediaFlowData
2828
public:
2929
MediaFlowData (std::shared_ptr<MediaType> type,
3030
const std::string &description,
31-
std::shared_ptr<MediaFlowState> state) {
31+
std::shared_ptr<MediaFlowState> state)
32+
{
3233
this->type = type;
3334
this->state = state;
3435
this->description = description;
3536
}
3637

37-
void setState (std::shared_ptr<MediaFlowState> state ) {
38+
void setState (std::shared_ptr<MediaFlowState> state )
39+
{
3840
this->state = state;
3941
}
4042

41-
std::shared_ptr<MediaFlowState> getState () {
43+
std::shared_ptr<MediaFlowState> getState ()
44+
{
4245
return this->state;
4346
}
4447

@@ -50,7 +53,8 @@ class MediaFlowData
5053

5154
struct MediaTypeCmp {
5255
bool operator() (const std::shared_ptr<MediaType> &a,
53-
const std::shared_ptr<MediaType> &b) const {
56+
const std::shared_ptr<MediaType> &b) const
57+
{
5458
return a->getValue () < b->getValue ();
5559
}
5660
};
@@ -71,7 +75,8 @@ class MediaElementImpl : public MediaObjectImpl, public virtual MediaElement
7175

7276
virtual ~MediaElementImpl ();
7377

74-
GstElement *getGstreamerElement() {
78+
GstElement *getGstreamerElement()
79+
{
7580
return element;
7681
};
7782

src/server/interface/KurentoException.hpp

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,26 @@ class KurentoException: public virtual std::exception
110110
code (code) {};
111111
virtual ~KurentoException() {};
112112

113-
virtual const char *what() const noexcept {
113+
virtual const char *what() const noexcept
114+
{
114115
return message.c_str();
115116
};
116117

117-
const std::string &getMessage() const {
118+
const std::string &getMessage() const
119+
{
118120
return message;
119121
};
120122

121-
int getCode() const {
123+
int getCode() const
124+
{
122125
return code;
123126
}
124127

125-
std::string getType() {
128+
std::string getType()
129+
{
126130
switch (code) {
127-
/* Error codes */
128-
/* GENERIC MEDIA ERRORS */
131+
/* Error codes */
132+
/* GENERIC MEDIA ERRORS */
129133

130134
// case MEDIA_ERROR:
131135
// return "MEDIA_ERROR";
@@ -155,7 +159,7 @@ class KurentoException: public virtual std::exception
155159
case NOT_ENOUGH_RESOURCES:
156160
return "NOT_ENOUGH_RESOURCES";
157161

158-
/* MediaObject ERRORS */
162+
/* MediaObject ERRORS */
159163
case MEDIA_OBJECT_TYPE_NOT_FOUND:
160164
return "MEDIA_OBJECT_TYPE_NOT_FOUND";
161165

@@ -190,7 +194,7 @@ class KurentoException: public virtual std::exception
190194
case MEDIA_OBJECT_OPERATION_NOT_SUPPORTED:
191195
return "MEDIA_OBJECT_OPERATION_NOT_SUPPORTED";
192196

193-
/* SDP ERRORS */
197+
/* SDP ERRORS */
194198
case SDP_CREATE_ERROR:
195199
return "SDP_CREATE_ERROR";
196200

@@ -227,22 +231,22 @@ class KurentoException: public virtual std::exception
227231
case SDP_END_POINT_CANNOT_CREATE_SESSON:
228232
return "SDP_END_POINT_CANNOT_CREATE_SESSON";
229233

230-
/* HTTP ERRORS */
234+
/* HTTP ERRORS */
231235
case HTTP_END_POINT_REGISTRATION_ERROR:
232236
return "HTTP_END_POINT_REGISTRATION_ERROR";
233237

234-
/* ICE ERRORS */
238+
/* ICE ERRORS */
235239
case ICE_GATHER_CANDIDATES_ERROR:
236240
return "ICE_GATHER_CANDIDATES_ERROR";
237241

238242
case ICE_ADD_CANDIDATE_ERROR:
239243
return "ICE_ADD_CANDIDATE_ERROR";
240244

241-
/* URI ERRORS */
245+
/* URI ERRORS */
242246
case URI_PATH_FILE_NOT_FOUND:
243247
return "URI_PATH_FILE_NOT_FOUND";
244248

245-
/*PLAYER ERRORS*/
249+
/*PLAYER ERRORS*/
246250
case PLAYER_SEEK_FAIL:
247251
return "PLAYER_SEEK_FAIL";
248252

tests/server/uriEndpoint.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,10 @@ BOOST_AUTO_TEST_CASE (check_media_element_uri)
143143
BOOST_ERROR ("Wrong URI returned by UriEndpoint");
144144
}
145145

146-
g_object_get (G_OBJECT(uriEndpoint->getGstreamerElement()), "uri", &uri_value, NULL);
146+
g_object_get (G_OBJECT (uriEndpoint->getGstreamerElement() ), "uri", &uri_value,
147+
NULL);
147148

148-
if (g_strcmp0 (uri_value, expected_uri.c_str ()) != 0) {
149+
if (g_strcmp0 (uri_value, expected_uri.c_str () ) != 0) {
149150
BOOST_ERROR ("Wrong URI returned by gstreamer element");
150151
}
151152

0 commit comments

Comments
 (0)