Unverified Commit 980d00b0 authored by mtsonline's avatar mtsonline Committed by GitHub
Browse files

Merge pull request #116 from ZAZmaster/localization

Localization
parents df2cce94 43402fa0
......@@ -7,6 +7,12 @@ if [ "${BBB_STREAM_URL}" != "" ]
then
STREAM_MEETING="-l -t ${BBB_STREAM_URL}";
fi
CHAT_STREAM_MESSAGE="";
if [ "${BBB_CHAT_STREAM_MESSAGE}" != "" ]
then
CHAT_STREAM_MESSAGE="--chatMsg ${BBB_CHAT_STREAM_MESSAGE}";
fi
CHAT_STREAM_URL="";
if [ "${BBB_CHAT_STREAM_URL}" != "" ]
......@@ -86,4 +92,4 @@ then
sleep 10
fi
xvfb-run -n 122 --server-args="-screen 0 ${RESOLUTION}x24" python3 stream.py -s ${BBB_URL} -p ${BBB_SECRET} -i "${BBB_MEETING_ID}" -u "${BBB_USER_NAME}" -r "${RESOLUTION}" ${SHOW_CHAT} $START_MEETING $ATTENDEE_PASSWORD $MODERATOR_PASSWORD $DEV_SHM_USAGE -T "$MEETING_TITLE" $STREAM_MEETING $CHAT_STREAM_URL $INTRO $BEGIN_INTRO $END_INTRO $DOWNLOAD_MEETING;
xvfb-run -n 122 --server-args="-screen 0 ${RESOLUTION}x24" python3 stream.py -s ${BBB_URL} -p ${BBB_SECRET} -i "${BBB_MEETING_ID}" -u "${BBB_USER_NAME}" -r "${RESOLUTION}" ${SHOW_CHAT} $START_MEETING $ATTENDEE_PASSWORD $MODERATOR_PASSWORD $DEV_SHM_USAGE -T "$MEETING_TITLE" $STREAM_MEETING $CHAT_STREAM_URL $CHAT_STREAM_MESSAGE $INTRO $BEGIN_INTRO $END_INTRO $DOWNLOAD_MEETING;
......@@ -39,6 +39,7 @@ parser.add_argument("-T","--meetingTitle", help="meeting title (required to crea
parser.add_argument("-u","--user", help="Name to join the meeting",default="Live")
parser.add_argument("-t","--target", help="RTMP Streaming URL")
parser.add_argument("--chatUrl", help="Streaming URL to display in the chat", default=False)
parser.add_argument("--chatMsg", help="Message to display in the chat before Streaming URL", default=False)
parser.add_argument("-c","--chat", help="Show the chat",action="store_true")
parser.add_argument("-r","--resolution", help="Resolution as WxH", default='1920x1080')
parser.add_argument('--ffmpeg-stream-threads', help='Threads to use for ffmpeg streaming', type=int,
......@@ -147,7 +148,10 @@ def bbb_browser():
tmp_chatUrl = args.target.partition('//')[2].partition('/')[0]
if args.chatUrl:
tmp_chatUrl = args.chatUrl
element.send_keys("This meeting is streamed to: %s" % tmp_chatUrl)
tmp_chatMsg = "This meeting is streamed to"
if args.chatMsg
tmp_chatMsg = args.chatMsg
element.send_keys("%s : %s" % tmp_chatMsg, tmp_chatUrl)
chat_send.click()
if args.chat:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment