jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Add popup warnings for connection failure

Browse Source 
Also, check for null stream path/key in the RTMP output module.
This commit is contained in:
jp9000
2014-05-12 15:30:36 -07:00
parent fa22417f8c
commit 03ca5919ce
7 changed files with 90 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/obs-outputs/rtmp-stream.c
View File

@@ -352,7 +352,8 @@ static int init_send(struct rtmp_stream *stream)
ret = pthread_create(&stream->send_thread, NULL, send_thread, stream);
if (ret != 0) {
RTMP_Close(&stream->rtmp);
return OBS_OUTPUT_FAIL;
blog(LOG_ERROR, __FILE__": Failed to create send thread");
return OBS_OUTPUT_ERROR;
}
stream->active = true;
@@ -365,6 +366,16 @@ static int init_send(struct rtmp_stream *stream)
static int try_connect(struct rtmp_stream *stream)
{
#ifndef FILE_TEST
if (dstr_isempty(&stream->path)) {
blog(LOG_WARNING, FILE_LINE "URL is empty");
return OBS_OUTPUT_BAD_PATH;
}
if (dstr_isempty(&stream->key)) {
blog(LOG_WARNING, FILE_LINE "Stream key is empty");
return OBS_OUTPUT_BAD_PATH;
}
blog(LOG_INFO, "Connecting to RTMP URL %s...", stream->path.array);
if (!RTMP_SetupURL2(&stream->rtmp, stream->path.array,