Skip to content

Commit 870e859

Browse files
committed
Replace plain numbers with enum
1 parent 7c58bab commit 870e859

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

server/src/isaac.cpp

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@
3737
return 1; \
3838
}
3939

40+
enum ImageConnectorType
41+
{
42+
RTP_H264 = 0,
43+
RTP_JPEG = 1,
44+
URI_JPEG = 2,
45+
TWITCH = 3,
46+
SDL = 4,
47+
SAVE_FILE = 5
48+
};
49+
4050
int main(int argc, char **argv)
4151
{
4252
json_object_seed(0);
@@ -189,15 +199,15 @@ int main(int argc, char **argv)
189199
#ifdef ISAAC_GST
190200
RTPImageConnector* rTPImageConnector_h264 = new RTPImageConnector(url,false,false);
191201
if (rTPImageConnector_h264->init(5000,5099) == 0)
192-
broker.addImageConnector(rTPImageConnector_h264, 0);
202+
broker.addImageConnector(rTPImageConnector_h264, ImageConnectorType::RTP_H264);
193203
RTPImageConnector* rTPImageConnector_jpeg = new RTPImageConnector(url,false,true);
194204
if (rTPImageConnector_jpeg->init(5100,5199) == 0)
195-
broker.addImageConnector(rTPImageConnector_jpeg, 1);
205+
broker.addImageConnector(rTPImageConnector_jpeg, ImageConnectorType::RTP_JPEG);
196206
#endif
197207
#ifdef ISAAC_JPEG
198208
URIImageConnector* uRIImageConnector = new URIImageConnector();
199209
if (uRIImageConnector->init(0,0) == 0)
200-
broker.addImageConnector(uRIImageConnector, 2);
210+
broker.addImageConnector(uRIImageConnector, ImageConnectorType::URI_JPEG);
201211
#endif
202212
#ifdef ISAAC_GST
203213
RTMPImageConnector* twitchImageConnector = NULL;
@@ -208,21 +218,21 @@ int main(int argc, char **argv)
208218
else
209219
twitchImageConnector = new RTMPImageConnector( std::string("Twitch"), std::string(twitch_apikey), std::string("live-fra.twitch.tv/app"), twitch_bitrate, true );
210220
if (twitchImageConnector->init(0,0) == 0)
211-
broker.addImageConnector(twitchImageConnector, 3);
221+
broker.addImageConnector(twitchImageConnector, ImageConnectorType::TWITCH);
212222
}
213223
#endif
214224
#ifdef ISAAC_SDL
215225
SDLImageConnector* sDLImageConnector = new SDLImageConnector();
216226
if (sDLImageConnector->init(0,0) == 0)
217-
broker.addImageConnector(sDLImageConnector, 4);
227+
broker.addImageConnector(sDLImageConnector, ImageConnectorType::SDL);
218228
#endif
219229
#ifdef ISAAC_JPEG
220230
SaveFileImageConnector* saveFileImageConnector = NULL;
221231
if (dump)
222232
{
223233
saveFileImageConnector = new SaveFileImageConnector(std::string(dump));
224234
if (saveFileImageConnector->init(0,0) == 0)
225-
broker.addImageConnector(saveFileImageConnector, 5);
235+
broker.addImageConnector(saveFileImageConnector, ImageConnectorType::SAVE_FILE);
226236
}
227237
#endif
228238
int return_code = 0;

0 commit comments

Comments
 (0)