|
7 | 7 | * http://opensource.org/licenses/MIT |
8 | 8 | * |
9 | 9 | * Author: Robert M. Hall |
10 | | - * Date: 29th January 2013 |
| 10 | + * Date: 3rd November 2013 |
11 | 11 | * Based on JplayerMp4.as with modifications for rtmp |
12 | 12 | */ |
13 | 13 |
|
@@ -508,32 +508,28 @@ package happyworm.jPlayer |
508 | 508 | } |
509 | 509 |
|
510 | 510 | // Mp3 streams with standard appname/no instance name, mp3: prefix |
511 | | - if (rtmpSrc.indexOf(".mp3") != -1) |
512 | | - { |
| 511 | + if (rtmpSrc.indexOf("mp3:") != -1) { |
513 | 512 | appName = rtmpSrc.substring(endHost,rtmpSrc.indexOf("mp3:")); |
514 | 513 | 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 | + } |
522 | 520 | } |
523 | 521 | // rtmp://cp83813.edgefcs.net/ondemand/rob_hall/bruce_campbell_oldspice.flv |
524 | 522 |
|
525 | 523 | // Mp4 streams with standard appname/no instance name, mp4: prefix |
526 | | - if (rtmpSrc.indexOf("mp4:") != -1) |
527 | | - { |
| 524 | + if (rtmpSrc.indexOf("mp4:") != -1) { |
528 | 525 | appName = rtmpSrc.substring(endHost,rtmpSrc.indexOf("mp4:")); |
529 | 526 | 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 | + } |
537 | 533 | } |
538 | 534 |
|
539 | 535 | // .f4v streams with standard appname/no instance name, .flv extension |
@@ -992,4 +988,4 @@ package happyworm.jPlayer |
992 | 988 | } |
993 | 989 | } |
994 | 990 | } |
995 | | -} |
| 991 | +} |
0 commit comments