Skip to content

Commit 5ca8187

Browse files
committed
Fixed logic errors in jplayer#161 and cleaned code styling.
1 parent e4a6c5d commit 5ca8187

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

actionscript/happyworm/jPlayer/JplayerRtmp.as

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* http://opensource.org/licenses/MIT
88
*
99
* Author: Robert M. Hall
10-
* Date: 29th January 2013
10+
* Date: 3rd November 2013
1111
* Based on JplayerMp4.as with modifications for rtmp
1212
*/
1313

@@ -508,32 +508,28 @@ package happyworm.jPlayer
508508
}
509509

510510
// Mp3 streams with standard appname/no instance name, mp3: prefix
511-
if (rtmpSrc.indexOf(".mp3") != -1)
512-
{
511+
if (rtmpSrc.indexOf("mp3:") != -1) {
513512
appName = rtmpSrc.substring(endHost,rtmpSrc.indexOf("mp3:"));
514513
streamFileName = rtmpSrc.substr(rtmpSrc.indexOf("mp3:"));
515-
if ( streamFileName.indexOf("?") )
516-
{
517-
var tmp:String = streamFileName.substring(streamFileName.indexOf("?")) ;
518-
streamFileName = streamFileName.substr(0,streamFileName.indexOf("?")) + encodeURI(tmp) ;
519-
}
520-
else
521-
streamFileName = streamFileName.substr(0,streamFileName.length - 4);
514+
if ( streamFileName.indexOf("?") != -1 ) {
515+
var tmp:String = streamFileName.substring(streamFileName.indexOf("?")) ;
516+
streamFileName = streamFileName.substr(0,streamFileName.indexOf("?")) + encodeURI(tmp) ;
517+
} else {
518+
streamFileName = streamFileName.substr(0,streamFileName.length - 4);
519+
}
522520
}
523521
// rtmp://cp83813.edgefcs.net/ondemand/rob_hall/bruce_campbell_oldspice.flv
524522

525523
// Mp4 streams with standard appname/no instance name, mp4: prefix
526-
if (rtmpSrc.indexOf("mp4:") != -1)
527-
{
524+
if (rtmpSrc.indexOf("mp4:") != -1) {
528525
appName = rtmpSrc.substring(endHost,rtmpSrc.indexOf("mp4:"));
529526
streamFileName = rtmpSrc.substr(rtmpSrc.indexOf("mp4:"));
530-
if ( streamFileName.indexOf("?") )
531-
{
532-
var tmpV:String = streamFileName.substring(streamFileName.indexOf("?")) ;
533-
streamFileName = streamFileName.substr(0,streamFileName.indexOf("?")) + encodeURI(tmpV) ;
534-
}
535-
else
536-
streamFileName = streamFileName.substr(0,streamFileName.length - 4);
527+
if ( streamFileName.indexOf("?") != -1 ) {
528+
var tmpV:String = streamFileName.substring(streamFileName.indexOf("?")) ;
529+
streamFileName = streamFileName.substr(0,streamFileName.indexOf("?")) + encodeURI(tmpV) ;
530+
} else {
531+
streamFileName = streamFileName.substr(0,streamFileName.length - 4);
532+
}
537533
}
538534

539535
// .f4v streams with standard appname/no instance name, .flv extension
@@ -992,4 +988,4 @@ package happyworm.jPlayer
992988
}
993989
}
994990
}
995-
}
991+
}

jquery.jplayer/Jplayer.swf

56 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)