| Index: trunk/extensions/WikiAtHome/NonFreeVideoHandler.php |
| — | — | @@ -311,7 +311,7 @@ |
| 312 | 312 | $waitHtml = wfMsgWikiHtml( 'wah-transcode-working' ) . '<br />'; |
| 313 | 313 | //check if we doing it ~at~ home then we know how far it is done: |
| 314 | 314 | if( $wgJobTypeConfig['transcode'][ 'assignAtHome' ] ){ |
| 315 | | - $waitHtml += wfMsgExt('wah-transcode-helpout', array('parsemag'), $this->percDone); |
| | 315 | + $waitHtml .= wfMsgExt('wah-transcode-helpout', array('parsemag'), $this->percDone); |
| 316 | 316 | } |
| 317 | 317 | } |
| 318 | 318 | |
| Index: trunk/extensions/WikiAtHome/WikiAtHome.php |
| — | — | @@ -55,7 +55,7 @@ |
| 56 | 56 | 'name' => 'Wiki@Home', |
| 57 | 57 | 'author' => 'Michael Dale', |
| 58 | 58 | 'url' => 'http://www.mediawiki.org/wiki/Extension:WikiAtHome', |
| 59 | | - 'description' => 'Enables distributing transcoding video jobs to clients using firefogg.', |
| | 59 | + 'description' => 'Enables distributing transcoding & flattening video jobs to clients using firefogg.', |
| 60 | 60 | 'descriptionmsg' => 'wah-desc', |
| 61 | 61 | ); |
| 62 | 62 | |
| — | — | @@ -236,7 +236,7 @@ |
| 237 | 237 | 'chunkDuration'=> 0, |
| 238 | 238 | // if the api should assign the job on the Special:WikiAtHome page |
| 239 | 239 | // (or via other external api scripts) |
| 240 | | - 'assignAtHome' => false, |
| | 240 | + 'assignAtHome' => true, |
| 241 | 241 | 'assignInternal'=> true |
| 242 | 242 | ), |
| 243 | 243 | 'flatten'=> array( |
| — | — | @@ -253,7 +253,7 @@ |
| 254 | 254 | //note first "in" wins & if once time is up we decrement set_c |
| 255 | 255 | $wgJobTimeOut = 60*10; //10 min |
| 256 | 256 | |
| 257 | | -//this meaters how many copies of any given stream we should send out as part of a job |
| | 257 | +//this sets how many copies of any given stream we should send out as part of a job |
| 258 | 258 | $wgNumberOfClientsPerJobSet = 25; |
| 259 | 259 | |
| 260 | 260 | //what to encode to: |
| Index: trunk/extensions/WikiAtHome/WahJobManager.php |
| — | — | @@ -427,5 +427,3 @@ |
| 428 | 428 | } |
| 429 | 429 | |
| 430 | 430 | } |
| 431 | | - |
| 432 | | -?> |
| \ No newline at end of file |