| Index: trunk/extensions/OggHandler/OggPlayer.js |
| — | — | @@ -8,7 +8,7 @@ |
| 9 | 9 | |
| 10 | 10 | // List of players in order of preference |
| 11 | 11 | // Downpreffed VLC because it crashes my browser all the damn time -- TS |
| 12 | | - 'players': ['cortado', 'quicktime-mozilla', 'quicktime-activex', 'vlc-mozilla', 'vlc-activex', 'totem', 'kmplayer', 'kaffeine', 'oggPlugin', 'videoElement'], |
| | 12 | + 'players': ['cortado', 'quicktime-mozilla', 'quicktime-activex', 'vlc-mozilla', 'vlc-activex', 'totem', 'kmplayer', 'kaffeine', 'mplayerplug-in', 'oggPlugin', 'videoElement'], |
| 13 | 13 | |
| 14 | 14 | // Client support table |
| 15 | 15 | 'clientSupports': { 'thumbnail' : true }, |
| — | — | @@ -22,7 +22,8 @@ |
| 23 | 23 | 'oggPlugin': 'application/ogg', |
| 24 | 24 | 'totem': 'application/ogg', |
| 25 | 25 | 'kmplayer': 'application/ogg', |
| 26 | | - 'kaffeine': 'application/ogg' |
| | 26 | + 'kaffeine': 'application/ogg', |
| | 27 | + 'mplayerplug-in': 'application/ogg' |
| 27 | 28 | }, |
| 28 | 29 | |
| 29 | 30 | 'savedThumbs': {}, |
| — | — | @@ -31,7 +32,8 @@ |
| 32 | 33 | 'defaultMsg' : { |
| 33 | 34 | 'ogg-player-totem': 'Totem', |
| 34 | 35 | 'ogg-player-kmplayer': 'KMPlayer', |
| 35 | | - 'ogg-player-kaffeine': 'Kaffeine' |
| | 36 | + 'ogg-player-kaffeine': 'Kaffeine', |
| | 37 | + 'ogg-player-mplayerplug-in': 'mplayerplug-in' |
| 36 | 38 | }, |
| 37 | 39 | |
| 38 | 40 | // Configuration from MW |
| — | — | @@ -91,6 +93,7 @@ |
| 92 | 94 | case 'kaffeine': |
| 93 | 95 | case 'totem': |
| 94 | 96 | case 'kmplayer': |
| | 97 | + case 'mplayerplug-in': |
| 95 | 98 | this.embedOggPlugin( elt, params, player ); |
| 96 | 99 | break; |
| 97 | 100 | case 'vlc-mozilla': |
| — | — | @@ -233,6 +236,11 @@ |
| 234 | 237 | } else if ( pluginFilename.indexOf( 'kaffeineplugin' ) > -1 ) { |
| 235 | 238 | // Kaffeine |
| 236 | 239 | player = 'kaffeine'; |
| | 240 | + } else if ( pluginName.indexOf( 'mplayerplug-in' ) > -1 ) { |
| | 241 | + player = 'mplayerplug-in'; |
| | 242 | + } else if ( pluginFilename.indexOf( 'mplayerplug-in-qt' ) > -1 ) { |
| | 243 | + // MPlayer fake QuickTime |
| | 244 | + player = ''; |
| 237 | 245 | } else if ( pluginName.indexOf( 'QuickTime Plug-in' ) > -1 ) { |
| 238 | 246 | // Note: Totem and KMPlayer also use this pluginName, which is |
| 239 | 247 | // why we check for them first |
| Index: trunk/extensions/OggHandler/OggHandler_body.php |
| — | — | @@ -400,7 +400,7 @@ |
| 401 | 401 | $msgNames = array( 'ogg-play', 'ogg-pause', 'ogg-stop', 'ogg-no-player', |
| 402 | 402 | 'ogg-player-videoElement', 'ogg-player-oggPlugin', 'ogg-player-cortado', 'ogg-player-vlc-mozilla', |
| 403 | 403 | 'ogg-player-vlc-activex', 'ogg-player-quicktime-mozilla', 'ogg-player-quicktime-activex', |
| 404 | | - 'ogg-player-totem', 'ogg-player-kaffeine', 'ogg-player-kmplayer', |
| | 404 | + 'ogg-player-totem', 'ogg-player-kaffeine', 'ogg-player-kmplayer', 'ogg-player-mplayerplug-in', |
| 405 | 405 | 'ogg-player-thumbnail', 'ogg-player-selected', 'ogg-use-player', 'ogg-more', 'ogg-download', |
| 406 | 406 | 'ogg-desc-link', 'ogg-dismiss', 'ogg-player-soundthumb', 'ogg-no-xiphqt' ); |
| 407 | 407 | $msgValues = array_map( 'wfMsg', $msgNames ); |
| Index: trunk/extensions/OggHandler/OggHandler.i18n.php |
| — | — | @@ -41,6 +41,7 @@ |
| 42 | 42 | 'ogg-player-totem' => 'Totem', # only translate this message to other languages if you have to change it |
| 43 | 43 | 'ogg-player-kmplayer' => 'KMPlayer', # only translate this message to other languages if you have to change it |
| 44 | 44 | 'ogg-player-kaffeine' => 'Kaffeine', # only translate this message to other languages if you have to change it |
| | 45 | + 'ogg-player-mplayerplug-in' => 'mplayerplug-in', # only translate this message to other languages if you have to change it |
| 45 | 46 | 'ogg-player-thumbnail' => 'Still image only', |
| 46 | 47 | 'ogg-player-soundthumb' => 'No player', |
| 47 | 48 | 'ogg-player-selected' => '(selected)', |