| Index: trunk/extensions/OggHandler/OggPlayer.js |
| — | — | @@ -5,7 +5,7 @@ |
| 6 | 6 | |
| 7 | 7 | // List of players in order of preference |
| 8 | 8 | // Downpreffed VLC because it crashes my browser all the damn time -- TS |
| 9 | | - 'players': ['videoElement', 'oggPlugin', 'cortado', 'quicktime-mozilla', 'quicktime-activex', 'vlc-mozilla', 'vlc-activex'], |
| | 9 | + 'players': ['cortado', 'quicktime-mozilla', 'quicktime-activex', 'vlc-mozilla', 'vlc-activex', 'oggPlugin', 'videoElement'], |
| 10 | 10 | |
| 11 | 11 | 'clientSupports': { 'thumbnail' : true }, |
| 12 | 12 | 'savedThumbs': {}, |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | * Main entry point: initialise a video player |
| 23 | 23 | * Player will be created as a child of the given ID |
| 24 | 24 | * There may be multiple players in a document. |
| 25 | | - * Parameters are: id, videoUrl, width, height, length, linkUrl |
| | 25 | + * Parameters are: id, videoUrl, width, height, length, linkUrl, isVideo |
| 26 | 26 | */ |
| 27 | 27 | 'init': function ( player, params ) { |
| 28 | 28 | elt = document.getElementById( params.id ); |
| — | — | @@ -152,14 +152,17 @@ |
| 153 | 153 | for ( var i = 0; i < navigator.mimeTypes.length; i++) { |
| 154 | 154 | var type = navigator.mimeTypes[i].type; |
| 155 | 155 | var pluginName = navigator.mimeTypes[i].enabledPlugin ? navigator.mimeTypes[i].enabledPlugin.name : ''; |
| 156 | | - if ( type == 'application/ogg' && pluginName.toLowerCase() == 'vlc multimedia plugin' ) { |
| 157 | | - this.clientSupports['vlc-mozilla'] = true; |
| | 156 | + if ( type == 'application/ogg' ) { |
| | 157 | + if ( pluginName.toLowerCase() == 'vlc multimedia plugin' ) { |
| | 158 | + this.clientSupports['vlc-mozilla'] = true; |
| | 159 | + } else if ( pluginName.indexOf( 'QuickTime' ) > -1 ) { |
| | 160 | + this.clientSupports['quicktime-mozilla'] = true; |
| | 161 | + } else { |
| | 162 | + this.clientSupports['oggPlugin'] = true; |
| | 163 | + } |
| 158 | 164 | continue; |
| 159 | 165 | } |
| 160 | | - if ( type == 'application/ogg' && pluginName.indexOf( 'QuickTime' ) > -1 ) { |
| 161 | | - this.clientSupports['quicktime-mozilla'] = true; |
| 162 | | - continue; |
| 163 | | - } |
| | 166 | + |
| 164 | 167 | if ( javaEnabled && type == 'application/x-java-applet' ) { |
| 165 | 168 | this.clientSupports['cortado'] = true; |
| 166 | 169 | continue; |