Christian Heimke commited on 2011-07-15 09:10:14
              Showing 22 changed files, with 68 additions and 61 deletions.
            
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -126,9 +126,9 @@ int main( int argCnt, char * * args ) | 
| 126 | 126 |  | 
| 127 | 127 | //print info | 
| 128 | 128 | printf( "BlinkenLib - BlinkenConv\n" | 
| 129 | - "version 0.6.4 date 2010-12-13\n" | |
| 129 | + "version 0.6.5 date 2011-04-26\n" | |
| 130 | 130 | "config "BLINKENLIB_CONFIG"\n" | 
| 131 | - "Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org>\n" | |
| 131 | + "Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>\n" | |
| 132 | 132 | "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" | 
| 133 | 133 | "a blinkenarea.org project\n\n" ); | 
| 134 | 134 |  | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -257,22 +257,25 @@ stBlinkenMovie * BlinkenMngLoad( char * pFilename ) | 
| 257 | 257 | mng_setcb_settimer( hMNG, BlMng_settimer ) == 0 && | 
| 258 | 258 |              mng_set_canvasstyle( hMNG, MNG_CANVAS_RGB8 ) == 0 ) { | 
| 259 | 259 |  | 
| 260 | - // read MNG file to memory | |
| 261 | -          if( mng_read( hMNG ) == 0 ) { | |
| 260 | + // request not to do lopping | |
| 261 | + // (stop with error at end of first iteration intead) | |
| 262 | +          if( mng_set_cacheplayback( hMNG, MNG_FALSE ) == 0 ) { | |
| 262 | 263 |  | 
| 263 | - // start "displaying" | |
| 264 | - mng_retcode iRC = mng_display( hMNG ); | |
| 264 | + // read MNG file to memory and start "displaying" | |
| 265 | + mng_retcode iRC = mng_readdisplay( hMNG ); | |
| 265 | 266 |              if( iRC == 0 || iRC == MNG_NEEDTIMERWAIT ) { | 
| 266 | 267 |  | 
| 267 | 268 | // "display" loop | 
| 268 | 269 | int b_saved = 0; | 
| 270 | + unsigned int frame_idx = 0; | |
| 269 | 271 |                while( iRC == MNG_NEEDTIMERWAIT && data->timer_msec > 0 ) { | 
| 270 | 272 |  | 
| 271 | 273 | // save fame to movie | 
| 272 | 274 | BlMng_save_frame( data->movie, data->timer_msec, data->width, data->height, data->canvas ); | 
| 273 | 275 | b_saved = 1; | 
| 276 | + ++frame_idx; | |
| 274 | 277 |  | 
| 275 | - // let requeired time elapse for MNG library | |
| 278 | + // let required time elapse for MNG library | |
| 276 | 279 | data->counter_msec += data->timer_msec; | 
| 277 | 280 | data->timer_msec = 0; | 
| 278 | 281 |  | 
| ... | ... | @@ -305,7 +308,7 @@ stBlinkenMovie * BlinkenMngLoad( char * pFilename ) | 
| 305 | 308 |  | 
| 306 | 309 | } // if( iRC == 0 || iRC == MNG_NEEDTIMERWAIT ) | 
| 307 | 310 |  | 
| 308 | - } // if( mng_read( ... ) == 0 ) | |
| 311 | + } // if (mng_set_cacheplayback ... ) | |
| 309 | 312 |  | 
| 310 | 313 | } // if( mng_setcb_... ) | 
| 311 | 314 |  | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | * | 
| ... | ... | @@ -423,9 +423,9 @@ int main( int argCnt, char * * args ) | 
| 423 | 423 |  | 
| 424 | 424 | //print info | 
| 425 | 425 | printf( "BlinkenLib - BlinkenOutput\n" | 
| 426 | - "version 0.6.4 date 2010-12-13\n" | |
| 426 | + "version 0.6.5 date 2011-04-26\n" | |
| 427 | 427 | "config "BLINKENLIB_CONFIG"\n" | 
| 428 | - "Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org>\n" | |
| 428 | + "Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>\n" | |
| 429 | 429 | "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" | 
| 430 | 430 | "a blinkenarea.org project\n\n" ); | 
| 431 | 431 |  | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -350,8 +350,8 @@ int main( int argCnt, char * * args ) | 
| 350 | 350 |  | 
| 351 | 351 | //print info | 
| 352 | 352 | printf( "BlinkenLib - BlinkenOutput\n" | 
| 353 | - "version 0.6.4 date 2010-12-13" | |
| 354 | - "Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org>\n" | |
| 353 | + "version 0.6.5 date 2011-04-26" | |
| 354 | + "Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>\n" | |
| 355 | 355 | "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" | 
| 356 | 356 | "a blinkenarea.org project\n\n" ); | 
| 357 | 357 |  | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -32,9 +32,9 @@ int main( int argCnt, char * * args ) | 
| 32 | 32 |  | 
| 33 | 33 | //print info | 
| 34 | 34 | printf( "BlinkenLib - BlinkenRecv\n" | 
| 35 | - "version 0.6.4 date 2010-12-13\n" | |
| 35 | + "version 0.6.5 date 2011-04-26\n" | |
| 36 | 36 | "config "BLINKENLIB_CONFIG"\n" | 
| 37 | - "Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org>\n" | |
| 37 | + "Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>\n" | |
| 38 | 38 | "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" | 
| 39 | 39 | "a blinkenarea.org project\n\n" ); | 
| 40 | 40 |  | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -35,9 +35,9 @@ int main( int argCnt, char * * args ) | 
| 35 | 35 |  | 
| 36 | 36 | //print info | 
| 37 | 37 | printf( "BlinkenLib - BlinkenSend\n" | 
| 38 | - "version 0.6.4 date 2010-12-13\n" | |
| 38 | + "version 0.6.5 date 2011-04-26\n" | |
| 39 | 39 | "config "BLINKENLIB_CONFIG"\n" | 
| 40 | - "Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org>\n" | |
| 40 | + "Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>\n" | |
| 41 | 41 | "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" | 
| 42 | 42 | "a blinkenarea.org project\n\n" ); | 
| 43 | 43 |  | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | # BlinkenLib | 
| 2 | -# version 0.6.4 date 2010-12-13 | |
| 3 | -# Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | +# version 0.6.5 date 2011-04-26 | |
| 3 | +# Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | # a blinkenarea.org project | 
| 6 | 6 |  | 
| ... | ... | @@ -12,7 +12,7 @@ RANLIB=ranlib | 
| 12 | 12 |  | 
| 13 | 13 | VERSION_MAJOR=0 | 
| 14 | 14 | VERSION_MINOR=6 | 
| 15 | -VERSION_REVISION=4 | |
| 15 | +VERSION_REVISION=5 | |
| 16 | 16 | VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION) | 
| 17 | 17 |  | 
| 18 | 18 | include ../config/config.mk | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | /* BlinkenLib | 
| 2 | - * version 0.6.4 date 2010-12-13 | |
| 3 | - * Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | + * version 0.6.5 date 2011-04-26 | |
| 3 | + * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | * a blinkenarea.org project | 
| 6 | 6 | */ | 
| ... | ... | @@ -1,12 +1,12 @@ | 
| 1 | 1 | # BlinkenLib | 
| 2 | -# version 0.6.4 date 2010-12-13 | |
| 3 | -# Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | +# version 0.6.5 date 2011-04-26 | |
| 3 | +# Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | # a blinkenarea.org project | 
| 6 | 6 |  | 
| 7 | 7 | VERSION_MAJOR=0 | 
| 8 | 8 | VERSION_MINOR=6 | 
| 9 | -VERSION_REVISION=4 | |
| 9 | +VERSION_REVISION=5 | |
| 10 | 10 | VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION) | 
| 11 | 11 |  | 
| 12 | 12 | DATE:=$(shell date +%Y-%m-%d) | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | # BlinkenLib | 
| 2 | -# version 0.6.4 date 2010-12-13 | |
| 3 | -# Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | +# version 0.6.5 date 2011-04-26 | |
| 3 | +# Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | # a blinkenarea.org project | 
| 6 | 6 |  | 
| ... | ... | @@ -1,6 +1,6 @@ | 
| 1 | 1 | # BlinkenLib | 
| 2 | -# version 0.6.4 date 2010-12-13 | |
| 3 | -# Copyright 2004-2010 Stefan Schuermans <stefan@blinkenarea.org> | |
| 2 | +# version 0.6.5 date 2011-04-26 | |
| 3 | +# Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org> | |
| 4 | 4 | # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html | 
| 5 | 5 | # a blinkenarea.org project | 
| 6 | 6 |  | 
| ... | ... | @@ -8,7 +8,7 @@ INSTALL=install | 
| 8 | 8 |  | 
| 9 | 9 | VERSION_MAJOR=0 | 
| 10 | 10 | VERSION_MINOR=6 | 
| 11 | -VERSION_REVISION=4 | |
| 11 | +VERSION_REVISION=5 | |
| 12 | 12 | VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION) | 
| 13 | 13 |  | 
| 14 | 14 | include ../config/config.mk | 
| 15 | 15 |