changed indenting to be more standard (142b777) - BlinkenLib · BlinkenArea

changed indenting to be more standard

Stefan Schuermans commited on 2011-10-16 11:26:43
Showing 18 changed files, with 1340 additions and 1326 deletions.

BlinkenLib/BlinkenColorizer.c 6707114..282e310
BlinkenLib/BlinkenColorizer.h e659013..f98d168
BlinkenLib/BlinkenConstants.h ee79e40..60de8ea
BlinkenLib/BlinkenConv.c ba87443..150b935
BlinkenLib/BlinkenFrame.c 65680e4..cf713ef
BlinkenLib/BlinkenFrame.h 491ed22..eb7195d
BlinkenLib/BlinkenLib.h 5b94761..9181b44
BlinkenLib/BlinkenMng.c 219edad..8706846
BlinkenLib/BlinkenMng.h 46dc936..9dabfef
BlinkenLib/BlinkenMovie.c ef60e33..f54c501
BlinkenLib/BlinkenMovie.h 6258e28..a35b218
BlinkenLib/BlinkenOutput.c 9348d01..936cbb0
BlinkenLib/BlinkenOutputWin.c 88727a1..acebc47
BlinkenLib/BlinkenRecv.c 75264ed..6346493
BlinkenLib/BlinkenSend.c dbe2120..cbe9b0e
BlinkenLib/Tools.c b507ebb..f5effba
BlinkenLib/Tools.h 581b146..47a1e1f
config/mng.c 2f7bb85..13dfe1e

@@ -1,15 +1,14 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #include <string.h>
 
 #include <BlinkenLib/Tools.h>
 #include <BlinkenLib/BlinkenColorizer.h>
 
-unsigned char BlinkenColorizerSolid( int step, int channels, int y, int x, int c )
+unsigned char BlinkenColorizerSolid(int step, int channels, int y, int x,
+                                    int c)
 {
   int substep, updown, chan;
   step %= channels * 2 * 254;
@@ -34,14 +33,14 @@ unsigned char BlinkenColorizerSolid( int step, int channels, int y, int x, int c
   y = x = 0;    // keep compiler quiet
 }
 
-unsigned char BlinkenColorizerRainbow( int step, int channels, int y, int x, int c )
+unsigned char BlinkenColorizerRainbow(int step, int channels, int y, int x,
+                                      int c)
 {
   return BlinkenColorizerSolid(step + ((x + y) * 64), channels, y, x, c);
 }
 
 // type describing a colorizing modes
-typedef struct _BlinkenColorizingModeDesc
-{
+typedef struct _BlinkenColorizingModeDesc {
   const char *name;
   unsigned char (*func) (int step, int channels, int y, int x, int c);
 } BlinkenColorizingModeDesc;
@@ -74,7 +73,8 @@ const char * BlinkenColorizerMode2Str( int mode )
 }
 
 // get color for colorizing
-unsigned char BlinkenColorizerGetColor( int channels, int mode, int step, int y, int x, int c )
+unsigned char BlinkenColorizerGetColor(int channels, int mode, int step,
+                                       int y, int x, int c)
 {
   if (mode < 0 || mode >= (int)arr_cnt(BlinkenColorizingModeDescs))
     return 255;

BlinkenLib/BlinkenColorizer.h

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #ifndef INC_BlinkenLib_BlinkenColorizer
 #define INC_BlinkenLib_BlinkenColorizer
@@ -15,7 +13,7 @@ int BlinkenColorizerStr2Mode( const char * str );
 const char *BlinkenColorizerMode2Str(int mode);
 
 // get color for colorizing
-unsigned char BlinkenColorizerGetColor( int channels, int mode, int step, int y, int x, int c );
+unsigned char BlinkenColorizerGetColor(int channels, int mode, int step,
+                                       int y, int x, int c);
 
 #endif // #ifndef INC_BlinkenLib_BlinkenColorizer
-

BlinkenLib/BlinkenConstants.h

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #ifndef INC_BlinkenLib_BlinkenConstants
 #define INC_BlinkenLib_BlinkenConstants

BlinkenLib/BlinkenConv.c

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -10,7 +8,8 @@
 
 #include <BlinkenLib/BlinkenLib.h>
 
-static void gen_test_movie( stBlinkenMovie * * ppMovie, const char * str_format, const char * str_mode, const char * str_duration )
+static void gen_test_movie(stBlinkenMovie ** ppMovie, const char *str_format,
+                           const char *str_mode, const char *str_duration)
 {
   unsigned int height, width, channels, colors;
   enum { ModeNone, ModeDots, ModeLines, ModeTrans } mode = ModeNone;
@@ -22,22 +21,22 @@ static void gen_test_movie( stBlinkenMovie * * ppMovie, const char * str_format,
     mode = ModeLines;
   if (strcmp(str_mode, "trans") == 0)
     mode = ModeTrans;
-  if( sscanf( str_format, "%ux%u-%u/%u", &width, &height, &channels, &colors ) != 4 )
+  if (sscanf(str_format, "%ux%u-%u/%u", &width, &height, &channels, &colors)
+      != 4)
     printf("invalid movie format \"%s\"\n", str_format);
   else if (mode == ModeNone)
     printf("invalid test mode \"%s\"\n", str_mode);
   else if (sscanf(str_duration, "%u", &duration) != 1)
     printf("invalid duration \"%s\"\n", str_duration);
-  else
-  {
+  else {
 
     if (*ppMovie != NULL)
       BlinkenMovieFree(*ppMovie);
     *ppMovie = BlinkenMovieNew(height, width, channels, colors - 1);
     if (*ppMovie == NULL)
-      printf( "could not create movie with format \"%ux%u-%x/%u\"\n", width, height, channels, colors );
-    else
-    {
+      printf("could not create movie with format \"%ux%u-%x/%u\"\n", width,
+             height, channels, colors);
+    else {
 
       unsigned int y, x, c, c2, c3, o, b, yy, xx, cc, oo;
       stBlinkenFrame *pFrame;
@@ -54,12 +53,15 @@ static void gen_test_movie( stBlinkenMovie * * ppMovie, const char * str_format,
         for (c = 0; c < channels; c++)
           for (y = 0; y < height; y++)
             for (x = 0; x < width; x++) {
-            pFrame = BlinkenFrameNew( height, width, channels, colors - 1, duration );
+              pFrame =
+                  BlinkenFrameNew(height, width, channels, colors - 1,
+                                  duration);
               for (yy = 0; yy < height; yy++)
                 for (xx = 0; xx < width; xx++)
                   for (cc = 0; cc < channels; cc++)
                     BlinkenFrameSetPixel(pFrame, yy, xx, cc,
-                yy == y && xx == x && cc == c ? colors - 1 : 0 );
+                                         yy == y && xx == x
+                                         && cc == c ? colors - 1 : 0);
               BlinkenMovieAppendFrame(*ppMovie, pFrame);
             }
         break;
@@ -67,7 +69,9 @@ static void gen_test_movie( stBlinkenMovie * * ppMovie, const char * str_format,
       case ModeLines:
         for (c = 0; c < channels; c++) {
           for (x = 0; x < width; x++) {
-              pFrame = BlinkenFrameNew( height, width, channels, colors - 1, duration );
+            pFrame =
+                BlinkenFrameNew(height, width, channels, colors - 1,
+                                duration);
             for (yy = 0; yy < height; yy++)
               for (xx = 0; xx < width; xx++)
                 for (cc = 0; cc < channels; cc++)
@@ -76,7 +80,9 @@ static void gen_test_movie( stBlinkenMovie * * ppMovie, const char * str_format,
             BlinkenMovieAppendFrame(*ppMovie, pFrame);
           }
           for (y = 0; y < height; y++) {
-              pFrame = BlinkenFrameNew( height, width, channels, colors - 1, duration );
+            pFrame =
+                BlinkenFrameNew(height, width, channels, colors - 1,
+                                duration);
             for (yy = 0; yy < height; yy++)
               for (xx = 0; xx < width; xx++)
                 for (cc = 0; cc < channels; cc++)
@@ -92,10 +98,13 @@ static void gen_test_movie( stBlinkenMovie * * ppMovie, const char * str_format,
           for (b = 0; b < 2; b++)
             for (c2 = 0; c2 < channels; c2++)
               for (o = 0; o < colors - 1; o++) {
-            pFrame = BlinkenFrameNew( height, width, channels, colors - 1, duration );
+                pFrame =
+                    BlinkenFrameNew(height, width, channels, colors - 1,
+                                    duration);
                 for (cc = 0; cc < channels; cc++) {
                   c3 = (cc + channels - c) % channels;
-              oo = b ? (c3 < c2 ? 0          : c3 > c2 ? colors - 1 : colors - 1 - o)
+                  oo = b ? (c3 < c2 ? 0 : c3 >
+                            c2 ? colors - 1 : colors - 1 - o)
                       : (c3 < c2 ? colors - 1 : c3 > c2 ? 0 : o);
                   for (yy = 0; yy < height; yy++)
                     for (xx = 0; xx < width; xx++)
@@ -130,11 +139,11 @@ int main( int argCnt, char * * args )
          "Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>\n"
          "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"
          "a blinkenarea.org project\n\n",
-          BLINKENLIB_VERSION_MAJOR, BLINKENLIB_VERSION_MINOR, BLINKENLIB_VERSION_REVISION );
+         BLINKENLIB_VERSION_MAJOR, BLINKENLIB_VERSION_MINOR,
+         BLINKENLIB_VERSION_REVISION);
 
   // print syntax
-  if( argCnt <= 1 )
-  {
+  if (argCnt <= 1) {
     printf("syntax: %s <parameter> [...]\n\n"
            "parameters:\n"
            "  -i <file>\n"
@@ -170,14 +178,11 @@ int main( int argCnt, char * * args )
   pMovie = NULL;
 
   // process parameters
-  for( i = 1; i < argCnt; i++ )
-  {
+  for (i = 1; i < argCnt; i++) {
 
     // read movie
-    if( strcmp( args[i], "-i" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    if (strcmp(args[i], "-i") == 0) {
+      if (i + 1 < argCnt) {
         i++;
         if (pMovie != NULL)
           BlinkenMovieFree(pMovie);
@@ -186,16 +191,12 @@ int main( int argCnt, char * * args )
           printf("could not read movie \"%s\"\n", args[i]);
         else
           printf("movie \"%s\" read\n", args[i]);
-      }
-      else
+      } else
         printf("missing input filename for \"-i\"\n");
     }
-
     // append movie
-    else if( strcmp( args[i], "-a" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-a") == 0) {
+      if (i + 1 < argCnt) {
         i++;
         if (pMovie == NULL)
           printf("no movie loaded to append to\n");
@@ -207,28 +208,24 @@ int main( int argCnt, char * * args )
           else {
             if (BlinkenMovieConcat(pMovie, pMovie2) < 0) {
               BlinkenMovieFree(pMovie2);
-              printf( "movie read from \"%s\" could not be appended\n", args[i] );
+              printf("movie read from \"%s\" could not be appended\n",
+                     args[i]);
             } else
               printf("movie \"%s\" read and appended\n", args[i]);
           }
         }
-      }
-      else
+      } else
         printf("missing input filename for \"-a\"\n");
     }
-
     // loop movie
-    else if( strcmp( args[i], "-l" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-l") == 0) {
+      if (i + 1 < argCnt) {
         i++;
         if (sscanf(args[i], "%u", &times) != 1 || times < 1)
           printf("invalid number of times \"%s\"\n", args[i]);
         else if (pMovie == NULL)
           printf("no movie loaded to loop\n");
-        else
-        {
+        else {
           stBlinkenMovie *pMovie2, *pMovie3;
           int err = 0;
           unsigned int t;
@@ -236,7 +233,8 @@ int main( int argCnt, char * * args )
           if (pMovie2 == NULL)
             err = 1;
           else {
-            for( t = 1 /* loop one time means nothing to do */; t < times; t++ ) {
+            for (t = 1 /* loop one time means nothing to do */ ; t < times;
+                 t++) {
               pMovie3 = BlinkenMovieClone(pMovie2);
               if (pMovie3 == NULL)
                 err = 1;
@@ -254,89 +252,73 @@ int main( int argCnt, char * * args )
           else
             printf("movie looped %u times\n", times);
         }
-      }
-      else
+      } else
         printf("missing movie format for \"-r\"\n");
     }
-
     // output format, frame count and duration of movie
-    else if( strcmp( args[i], "-f" ) == 0 )
-    {
+    else if (strcmp(args[i], "-f") == 0) {
       if (pMovie == NULL)
-        printf( "no movie loaded to output format, frame count and duration of\n" );
+        printf
+            ("no movie loaded to output format, frame count and duration of\n");
       else
-        printf( "format:      %ux%u-%u/%u\nframe count: %u\nduration:    %u ms\n",
-               BlinkenMovieGetWidth( pMovie ),
-               BlinkenMovieGetHeight( pMovie ),
+        printf
+            ("format:      %ux%u-%u/%u\nframe count: %u\nduration:    %u ms\n",
+             BlinkenMovieGetWidth(pMovie), BlinkenMovieGetHeight(pMovie),
              BlinkenMovieGetChannels(pMovie),
              BlinkenMovieGetMaxval(pMovie) + 1,
              BlinkenMovieGetFrameCnt(pMovie),
              BlinkenMovieGetDuration(pMovie));
     }
-
     // print movie
-    else if( strcmp( args[i], "-p" ) == 0 )
-    {
+    else if (strcmp(args[i], "-p") == 0) {
       if (pMovie == NULL)
         printf("no movie loaded to print\n");
-      else
-      {
+      else {
         str = BlinkenMovieToString(pMovie);
         if (str == NULL)
           printf("could not print movie\n");
-        else
-        {
+        else {
           printf("%s", str);
           free(str);
         }
       }
     }
-
     // resize movie
-    else if( strcmp( args[i], "-r" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-r") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( sscanf( args[i], "%ux%u-%u/%u", &width, &height, &channels, &colors ) != 4 )
+        if (sscanf
+            (args[i], "%ux%u-%u/%u", &width, &height, &channels,
+             &colors) != 4)
           printf("invalid movie format \"%s\"\n", args[i]);
         else if (pMovie == NULL)
           printf("no movie loaded to resize\n");
-        else
-        {
+        else {
           BlinkenMovieResize(pMovie, height, width, channels, colors - 1);
-          printf( "movie resized to %ux%u-%u/%u\n", width, height, channels, colors );
-        }
+          printf("movie resized to %ux%u-%u/%u\n", width, height, channels,
+                 colors);
         }
-      else
+      } else
         printf("missing movie format for \"-r\"\n");
     }
-
     // scale movie
-    else if( strcmp( args[i], "-s" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-s") == 0) {
+      if (i + 1 < argCnt) {
         i++;
         if (sscanf(args[i], "%ux%u", &width, &height) != 2)
           printf("invalid movie dimensions \"%s\"\n", args[i]);
         else if (pMovie == NULL)
           printf("no movie loaded to scale\n");
-        else
-        {
+        else {
           BlinkenMovieScale(pMovie, height, width);
           printf("movie scaled to %ux%u\n", width, height);
         }
-      }
-      else
+      } else
         printf("missing movie dimensions for \"-s\"\n");
     }
-
     // colorize movie
-    else if( strcmp( args[i], "-c" ) == 0 )
-    {
-      if( i + 2 < argCnt )
-      {
+    else if (strcmp(args[i], "-c") == 0) {
+      if (i + 2 < argCnt) {
         const char *str_channels, *str_mode;
         i++;
         str_channels = args[i];
@@ -344,32 +326,26 @@ int main( int argCnt, char * * args )
         str_mode = args[i];
         if (sscanf(str_channels, "%u", &channels) != 1)
           printf("invalid number of channels \"%s\"\n", str_channels);
-        else
-        {
+        else {
           mode = BlinkenColorizerStr2Mode(str_mode);
           if (mode < 0)
             printf("invalid colorizing mode \"%s\"\n", str_mode);
           else if (pMovie == NULL)
             printf("no movie loaded to colorize\n");
-          else
-          {
+          else {
             BlinkenMovieColorize(pMovie, channels, mode);
-            printf( "movie colorized to %u channels using mode %s\n", channels, BlinkenColorizerMode2Str( mode ) );
+            printf("movie colorized to %u channels using mode %s\n", channels,
+                   BlinkenColorizerMode2Str(mode));
           }
         }
-      }
-      else if( i + 1 < argCnt )
-      {
+      } else if (i + 1 < argCnt) {
         printf("missing colorizing mode for \"-c\"\n");
         i++;
-      }
-      else
+      } else
         printf("missing number of channels for \"-c\"\n");
     }
-
     // reverse movie
-    else if( strcmp( args[i], "-R" ) == 0 )
-    {
+    else if (strcmp(args[i], "-R") == 0) {
       if (pMovie == NULL)
         printf("no movie loaded to reverse\n");
       else {
@@ -377,12 +353,9 @@ int main( int argCnt, char * * args )
         printf("movie reversed\n");
       }
     }
-
     // delete frames
-    else if( strcmp( args[i], "-d" ) == 0 )
-    {
-      if( i + 2 < argCnt )
-      {
+    else if (strcmp(args[i], "-d") == 0) {
+      if (i + 2 < argCnt) {
         const char *str_first, *str_count;
         unsigned int first, count, c;
         i++;
@@ -396,30 +369,27 @@ int main( int argCnt, char * * args )
             printf("invalid number of frames \"%s\"\n", str_count);
           else if (pMovie == NULL)
             printf("no movie loaded to delete frames from\n");
-          else if( first + count > (unsigned int)BlinkenMovieGetFrameCnt( pMovie ) )
-            printf( "invalid frame range (%u-%u) for deletion from %u frames\n",
-                    first, first + count, (unsigned int)BlinkenMovieGetFrameCnt( pMovie ) );
+          else if (first + count >
+                   (unsigned int)BlinkenMovieGetFrameCnt(pMovie))
+            printf
+                ("invalid frame range (%u-%u) for deletion from %u frames\n",
+                 first, first + count,
+                 (unsigned int)BlinkenMovieGetFrameCnt(pMovie));
           else {
             for (c = 0; c < count; c++)
               BlinkenMovieDeleteFrame(pMovie, first);
             printf("deleted frames %u-%u\n", first, first + count);
           }
         }
-      }
-      else if( i + 1 < argCnt )
-      {
+      } else if (i + 1 < argCnt) {
         printf("missing colorizing mode for \"-c\"\n");
         i++;
-      }
-      else
+      } else
         printf("missing number of channels for \"-c\"\n");
     }
-
     // generate test movie
-    else if( strcmp( args[i], "-t" ) == 0 )
-    {
-      if( i + 3 < argCnt )
-      {
+    else if (strcmp(args[i], "-t") == 0) {
+      if (i + 3 < argCnt) {
         const char *str_format, *str_mode, *str_duration;
         i++;
         str_format = args[i];
@@ -428,43 +398,32 @@ int main( int argCnt, char * * args )
         i++;
         str_duration = args[i];
         gen_test_movie(&pMovie, str_format, str_mode, str_duration);
-      }
-      else if( i + 2 < argCnt )
-      {
+      } else if (i + 2 < argCnt) {
         printf("missing duration for \"-t\"\n");
         i += 2;
-      }
-      else if( i + 1 < argCnt )
-      {
+      } else if (i + 1 < argCnt) {
         printf("missing test mode for \"-t\"\n");
         i++;
-      }
-      else
+      } else
         printf("missing format for \"-t\"\n");
     }
-
     // write movie
-    else if( strcmp( args[i], "-o" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-o") == 0) {
+      if (i + 1 < argCnt) {
         i++;
         if (pMovie == NULL)
           printf("no movie loaded to write to \"%s\"\n", args[i]);
-        else
-          if( BlinkenMovieSave( pMovie, args[i] ) < 0 )
+        else if (BlinkenMovieSave(pMovie, args[i]) < 0)
           printf("could not write movie \"%s\"\n", args[i]);
         else
           printf("movie \"%s\" written\n", args[i]);
-      }
-      else
+      } else
         printf("missing output filename for \"-o\"\n");
     }
-
     // old style input filename
-    else if( i == 1 && args[i][0] != '-' )
-    {
-      printf( "old style input filename \"%s\", better use \"-i %s\"\n", args[i], args[i] );
+    else if (i == 1 && args[i][0] != '-') {
+      printf("old style input filename \"%s\", better use \"-i %s\"\n",
+             args[i], args[i]);
       if (pMovie != NULL)
         BlinkenMovieFree(pMovie);
       pMovie = BlinkenMovieLoad(args[i]);
@@ -473,34 +432,31 @@ int main( int argCnt, char * * args )
       else
         printf("movie \"%s\" read\n", args[i]);
     }
-
     // old style output filename
-    else if( i == 2 && args[i][0] != '-' )
-    {
-      printf( "old style output filename \"%s\", better use \"-o %s\"\n", args[i], args[i] );
+    else if (i == 2 && args[i][0] != '-') {
+      printf("old style output filename \"%s\", better use \"-o %s\"\n",
+             args[i], args[i]);
       if (pMovie == NULL)
         printf("no movie loaded to write to \"%s\"\n", args[i]);
-      else
-        if( BlinkenMovieSave( pMovie, args[i] ) < 0 )
+      else if (BlinkenMovieSave(pMovie, args[i]) < 0)
         printf("could not write movie \"%s\"\n", args[i]);
       else
         printf("movie \"%s\" written\n", args[i]);
     }
-
     // unknown parameter
     else
-      printf( "unknown parameter \"%s\", call without parameters to get help\n", args[i] );
+      printf
+          ("unknown parameter \"%s\", call without parameters to get help\n",
+           args[i]);
 
   }     // for( i ...
 
   // old style print
-  if( argCnt == 2 && pMovie != NULL )
-  {
+  if (argCnt == 2 && pMovie != NULL) {
     str = BlinkenMovieToString(pMovie);
     if (str == NULL)
       printf("could not print movie\n");
-    else
-    {
+    else {
       printf("%s", str);
       free(str);
     }

BlinkenLib/BlinkenFrame.c

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,8 +20,7 @@ typedef DWORD uint32_t;
 #include <BlinkenLib/BlinkenFrame.h>
 #include <BlinkenLib/Tools.h>
 
-struct sBlinkenFrame
-{
+struct sBlinkenFrame {
   int height;
   int width;
   int channels;
@@ -33,24 +30,21 @@ struct sBlinkenFrame
 };
 
 // blinken protocol headers
-typedef struct sBlinkenProtoBlpHdr
-{
+typedef struct sBlinkenProtoBlpHdr {
   uint32_t magic;
   uint32_t frameNo;
   uint16_t width;
   uint16_t height;
 } stBlinkenProtoBlpHdr;
 #define BlinkenProtoBlpMagic 0xDEADBEEF
-typedef struct sBlinkenProtoEblpHdr
-{
+typedef struct sBlinkenProtoEblpHdr {
   uint32_t magic;
   uint32_t frameNo;
   uint16_t width;
   uint16_t height;
 } stBlinkenProtoEblpHdr;
 #define BlinkenProtoEblpMagic 0xFEEDBEEF
-typedef struct sBlinkenProtoMcufHdr
-{
+typedef struct sBlinkenProtoMcufHdr {
   uint32_t magic;
   uint16_t height;
   uint16_t width;
@@ -59,20 +53,31 @@ typedef struct sBlinkenProtoMcufHdr
 } stBlinkenProtoMcufHdr;
 #define BlinkenProtoMcufMagic 0x23542666
 
-stBlinkenFrame * BlinkenFrameNew( int height, int width, int channels, int maxval, int duration )
+stBlinkenFrame *BlinkenFrameNew(int height, int width, int channels,
+                                int maxval, int duration)
 {
   stBlinkenFrame *pFrame;
 
-  if( height < BlinkenHeightMin ) height = BlinkenHeightMin;
-  if( height > BlinkenHeightMax ) height = BlinkenHeightMax;
-  if( width < BlinkenWidthMin ) width = BlinkenWidthMin;
-  if( width > BlinkenWidthMax ) width = BlinkenWidthMax;
-  if( channels < BlinkenChannelsMin ) channels = BlinkenChannelsMin;
-  if( channels > BlinkenChannelsMax ) channels = BlinkenMaxvalMax;
-  if( maxval < BlinkenMaxvalMin ) maxval = BlinkenMaxvalMin;
-  if( maxval > BlinkenMaxvalMax ) maxval = BlinkenMaxvalMax;
-  if( duration < BlinkenDurationMin ) duration = BlinkenDurationMin;
-  if( duration > BlinkenDurationMax ) duration = BlinkenDurationMax;
+  if (height < BlinkenHeightMin)
+    height = BlinkenHeightMin;
+  if (height > BlinkenHeightMax)
+    height = BlinkenHeightMax;
+  if (width < BlinkenWidthMin)
+    width = BlinkenWidthMin;
+  if (width > BlinkenWidthMax)
+    width = BlinkenWidthMax;
+  if (channels < BlinkenChannelsMin)
+    channels = BlinkenChannelsMin;
+  if (channels > BlinkenChannelsMax)
+    channels = BlinkenMaxvalMax;
+  if (maxval < BlinkenMaxvalMin)
+    maxval = BlinkenMaxvalMin;
+  if (maxval > BlinkenMaxvalMax)
+    maxval = BlinkenMaxvalMax;
+  if (duration < BlinkenDurationMin)
+    duration = BlinkenDurationMin;
+  if (duration > BlinkenDurationMax)
+    duration = BlinkenDurationMax;
 
   pFrame = (stBlinkenFrame *) malloc(sizeof(stBlinkenFrame));
   if (pFrame == NULL)
@@ -84,9 +89,10 @@ stBlinkenFrame * BlinkenFrameNew( int height, int width, int channels, int maxva
   pFrame->maxval = maxval;
   pFrame->duration = duration;
 
-  pFrame->ppData = (unsigned char * *)malloc2D( height, width * channels, sizeof( unsigned char ) );
-  if( pFrame->ppData == NULL )
-  {
+  pFrame->ppData =
+      (unsigned char **)malloc2D(height, width * channels,
+                                 sizeof(unsigned char));
+  if (pFrame->ppData == NULL) {
     free(pFrame);
     return NULL;
   }
@@ -103,7 +109,8 @@ stBlinkenFrame * BlinkenFrameClone( stBlinkenFrame * pSrcFrame )
     return NULL;
 
   pFrame = BlinkenFrameNew(pSrcFrame->height, pSrcFrame->width,
-                            pSrcFrame->channels, pSrcFrame->maxval, pSrcFrame->duration );
+                           pSrcFrame->channels, pSrcFrame->maxval,
+                           pSrcFrame->duration);
   if (pFrame == NULL)
     return NULL;
 
@@ -182,29 +189,31 @@ void BlinkenFrameSetDuration( stBlinkenFrame * pFrame, int duration )
   if (pFrame == NULL)
     return;
 
-  if( duration < BlinkenDurationMin ) duration = BlinkenDurationMin;
-  if( duration > BlinkenDurationMax ) duration = BlinkenDurationMax;
+  if (duration < BlinkenDurationMin)
+    duration = BlinkenDurationMin;
+  if (duration > BlinkenDurationMax)
+    duration = BlinkenDurationMax;
 
   pFrame->duration = duration;
 }
 
-unsigned char BlinkenFrameGetPixel( stBlinkenFrame * pFrame, int y, int x, int c )
+unsigned char BlinkenFrameGetPixel(stBlinkenFrame * pFrame, int y, int x,
+                                   int c)
 {
   if (pFrame == NULL ||
       y < 0 || y >= pFrame->height ||
-      x < 0 || x >= pFrame->width ||
-      c < 0 || c >= pFrame->channels )
+      x < 0 || x >= pFrame->width || c < 0 || c >= pFrame->channels)
     return 0;
 
   return pFrame->ppData[y][x * pFrame->channels + c];
 }
 
-void BlinkenFrameSetPixel( stBlinkenFrame * pFrame, int y, int x, int c, unsigned char val )
+void BlinkenFrameSetPixel(stBlinkenFrame * pFrame, int y, int x, int c,
+                          unsigned char val)
 {
   if (pFrame == NULL ||
       y < 0 || y >= pFrame->height ||
-      x < 0 || x >= pFrame->width ||
-      c < 0 || c >= pFrame->channels )
+      x < 0 || x >= pFrame->width || c < 0 || c >= pFrame->channels)
     return;
 
   if (val > pFrame->maxval)
@@ -217,31 +226,49 @@ unsigned long BlinkenFrameGetColor( stBlinkenFrame * pFrame, int y, int x )
   int i;
 
   if (pFrame == NULL ||
-      y < 0 || y >= pFrame->height ||
-      x < 0 || x >= pFrame->width )
+      y < 0 || y >= pFrame->height || x < 0 || x >= pFrame->width)
     return 0;
 
   i = x * pFrame->channels;
 
   if (pFrame->channels == 1)
-    return (((unsigned long)pFrame->ppData[y][i + 0] * 255 + pFrame->maxval / 2) / pFrame->maxval) << 16 |
-           (((unsigned long)pFrame->ppData[y][i + 0] * 255 + pFrame->maxval / 2) / pFrame->maxval) << 8 |
-           (((unsigned long)pFrame->ppData[y][i + 0] * 255 + pFrame->maxval / 2) / pFrame->maxval);
+    return (((unsigned long)pFrame->ppData[y][i + 0] * 255 +
+             pFrame->maxval / 2) /
+            pFrame->
+            maxval) << 16 | (((unsigned long)pFrame->ppData[y][i + 0] * 255 +
+                              pFrame->maxval / 2) /
+                             pFrame->maxval) << 8 | (((unsigned long)
+                                                      pFrame->ppData[y][i +
+                                                                        0] *
+                                                      255 +
+                                                      pFrame->maxval / 2) /
+                                                     pFrame->maxval);
   if (pFrame->channels == 2)
-    return (((unsigned long)pFrame->ppData[y][i + 0] * 255 + pFrame->maxval / 2) / pFrame->maxval) << 16 |
-           (((unsigned long)pFrame->ppData[y][i + 1] * 255 + pFrame->maxval / 2) / pFrame->maxval) << 8;
-  return (((unsigned long)pFrame->ppData[y][i + 0] * 255 + pFrame->maxval / 2) / pFrame->maxval) << 16 |
-         (((unsigned long)pFrame->ppData[y][i + 1] * 255 + pFrame->maxval / 2) / pFrame->maxval) << 8 |
-         (((unsigned long)pFrame->ppData[y][i + 2] * 255 + pFrame->maxval / 2) / pFrame->maxval);
-}
-
-void BlinkenFrameSetColor( stBlinkenFrame * pFrame, int y, int x, unsigned long color )
+    return (((unsigned long)pFrame->ppData[y][i + 0] * 255 +
+             pFrame->maxval / 2) /
+            pFrame->
+            maxval) << 16 | (((unsigned long)pFrame->ppData[y][i + 1] * 255 +
+                              pFrame->maxval / 2) / pFrame->maxval) << 8;
+  return (((unsigned long)pFrame->ppData[y][i + 0] * 255 +
+           pFrame->maxval / 2) /
+          pFrame->maxval) << 16 | (((unsigned long)pFrame->ppData[y][i + 1] *
+                                    255 +
+                                    pFrame->maxval / 2) /
+                                   pFrame->maxval) << 8 | (((unsigned long)
+                                                            pFrame->ppData[y]
+                                                            [i + 2] * 255 +
+                                                            pFrame->maxval /
+                                                            2) /
+                                                           pFrame->maxval);
+}
+
+void BlinkenFrameSetColor(stBlinkenFrame * pFrame, int y, int x,
+                          unsigned long color)
 {
   int i, alpha, alpha_, c;
 
   if (pFrame == NULL ||
-      y < 0 || y >= pFrame->height ||
-      x < 0 || x >= pFrame->width )
+      y < 0 || y >= pFrame->height || x < 0 || x >= pFrame->width)
     return;
 
   i = x * pFrame->channels;
@@ -249,21 +276,31 @@ void BlinkenFrameSetColor( stBlinkenFrame * pFrame, int y, int x, unsigned long
   alpha = (color >> 24) & 0xFF;
   alpha_ = 255 - alpha;
   if (pFrame->channels >= 1)
-    pFrame->ppData[y][i + 0] = (unsigned char)(( ((((color >> 16) & 0xFF) * pFrame->maxval + 127) / 255) * alpha
-                                               + (unsigned long)pFrame->ppData[y][i + 0] * alpha_
-                                               ) / 255);
+    pFrame->ppData[y][i + 0] =
+        (unsigned
+         char)((((((color >> 16) & 0xFF) * pFrame->maxval +
+                  127) / 255) * alpha + (unsigned long)pFrame->ppData[y][i +
+                                                                         0] *
+                alpha_) / 255);
   if (pFrame->channels >= 2)
-    pFrame->ppData[y][i + 1] = (unsigned char)(( ((((color >> 8) & 0xFF) * pFrame->maxval + 127) / 255) * alpha
-                                               + (unsigned long)pFrame->ppData[y][i + 1] * alpha_
-                                               ) / 255);
+    pFrame->ppData[y][i + 1] =
+        (unsigned
+         char)((((((color >> 8) & 0xFF) * pFrame->maxval +
+                  127) / 255) * alpha + (unsigned long)pFrame->ppData[y][i +
+                                                                         1] *
+                alpha_) / 255);
   if (pFrame->channels >= 3)
-    pFrame->ppData[y][i + 2] = (unsigned char)(( (((color & 0xFF) * pFrame->maxval + 127) / 255) * alpha
-                                               + (unsigned long)pFrame->ppData[y][i + 2] * alpha_
-                                               ) / 255);
+    pFrame->ppData[y][i + 2] =
+        (unsigned
+         char)(((((color & 0xFF) * pFrame->maxval + 127) / 255) * alpha +
+                (unsigned long)pFrame->ppData[y][i + 2] * alpha_) / 255);
   for (c = 3; c < pFrame->channels; c++)
     pFrame->ppData[y][i + c] = (unsigned char)((0
-                                               + (unsigned long)pFrame->ppData[y][i + c] * alpha_
-                                               ) / 255);
+                                                +
+                                                (unsigned long)
+                                                pFrame->ppData[y][i +
+                                                                  c] *
+                                                alpha_) / 255);
 }
 
 int BlinkenFrameIsEmpty(stBlinkenFrame * pFrame)
@@ -315,7 +352,9 @@ int BlinkenFrameCompare( stBlinkenFrame * pFrame1, stBlinkenFrame * pFrame2 )
     return 1;
 
   for (y = 0; y < pFrame1->height; y++) {
-    cmp = memcmp( pFrame1->ppData[y], pFrame2->ppData[y], pFrame1->width * pFrame2->channels );
+    cmp =
+        memcmp(pFrame1->ppData[y], pFrame2->ppData[y],
+               pFrame1->width * pFrame2->channels);
     if (cmp != 0)
       return cmp;
   }
@@ -323,7 +362,8 @@ int BlinkenFrameCompare( stBlinkenFrame * pFrame1, stBlinkenFrame * pFrame2 )
   return 0;
 }
 
-void BlinkenFrameResize( stBlinkenFrame * pFrame, int height, int width, int channels, int maxval )
+void BlinkenFrameResize(stBlinkenFrame * pFrame, int height, int width,
+                        int channels, int maxval)
 {
   unsigned char **ppData;
   int y, x, c, i, j;
@@ -333,23 +373,32 @@ void BlinkenFrameResize( stBlinkenFrame * pFrame, int height, int width, int cha
   if (pFrame == NULL)
     return;
 
-  if( height < BlinkenHeightMin ) height = BlinkenHeightMin;
-  if( height > BlinkenHeightMax ) height = BlinkenHeightMax;
-  if( width < BlinkenWidthMin ) width = BlinkenWidthMin;
-  if( width > BlinkenWidthMax ) width = BlinkenWidthMax;
-  if( channels < BlinkenChannelsMin ) channels = BlinkenChannelsMin;
-  if( channels > BlinkenChannelsMax ) channels = BlinkenMaxvalMax;
-  if( maxval < BlinkenMaxvalMin ) maxval = BlinkenMaxvalMin;
-  if( maxval > BlinkenMaxvalMax ) maxval = BlinkenMaxvalMax;
+  if (height < BlinkenHeightMin)
+    height = BlinkenHeightMin;
+  if (height > BlinkenHeightMax)
+    height = BlinkenHeightMax;
+  if (width < BlinkenWidthMin)
+    width = BlinkenWidthMin;
+  if (width > BlinkenWidthMax)
+    width = BlinkenWidthMax;
+  if (channels < BlinkenChannelsMin)
+    channels = BlinkenChannelsMin;
+  if (channels > BlinkenChannelsMax)
+    channels = BlinkenMaxvalMax;
+  if (maxval < BlinkenMaxvalMin)
+    maxval = BlinkenMaxvalMin;
+  if (maxval > BlinkenMaxvalMax)
+    maxval = BlinkenMaxvalMax;
 
   if (height == pFrame->height &&
       width == pFrame->width &&
-      channels == pFrame->channels &&
-      maxval == pFrame->maxval )
+      channels == pFrame->channels && maxval == pFrame->maxval)
     return;
 
   // allocate new data array
-  ppData = (unsigned char * *)malloc2D( height, width * channels, sizeof( unsigned char ) );
+  ppData =
+      (unsigned char **)malloc2D(height, width * channels,
+                                 sizeof(unsigned char));
   if (ppData == NULL)
     return;
   for (y = 0; y < height; y++)
@@ -358,54 +407,54 @@ void BlinkenFrameResize( stBlinkenFrame * pFrame, int height, int width, int cha
         ppData[y][i] = 0;
 
   // get number of pixels to skip / to leave empty in X and Y direction
-  if( height > pFrame->height )
-  {
+  if (height > pFrame->height) {
     emptyY = (height - pFrame->height) / 2;
     skipY = 0;
     rangeY = pFrame->height;
-  }
-  else
-  {
+  } else {
     emptyY = 0;
     skipY = (pFrame->height - height) / 2;
     rangeY = height;
   }
-  if( width > pFrame->width )
-  {
+  if (width > pFrame->width) {
     emptyX = (width - pFrame->width) / 2;
     skipX = 0;
     rangeX = pFrame->width;
-  }
-  else
-  {
+  } else {
     emptyX = 0;
     skipX = (pFrame->width - width) / 2;
     rangeX = width;
   }
 
   // resize frame with help of calculated parameters
-  for( y = 0; y < rangeY; y++ )
-  {
-    for( x = 0; x < rangeX; x++ )
-    {
+  for (y = 0; y < rangeY; y++) {
+    for (x = 0; x < rangeX; x++) {
       i = (skipX + x) * pFrame->channels;
       j = (emptyX + x) * channels;
-      if( channels >= pFrame->channels ) //add channels: copy last channel into new channels
+      if (channels >= pFrame->channels) // add channels: copy last channel
+        // into new channels
       {
         for (c = 0; c < pFrame->channels; c++, i++, j++)
-          ppData[emptyY + y][j] = (unsigned char)(((unsigned long)pFrame->ppData[skipY + y][i] * maxval + pFrame->maxval / 2) / pFrame->maxval);
+          ppData[emptyY + y][j] =
+              (unsigned
+               char)(((unsigned long)pFrame->ppData[skipY + y][i] * maxval +
+                      pFrame->maxval / 2) / pFrame->maxval);
         for (; c < channels; c++, j++)
           ppData[emptyY + y][j] = ppData[emptyY + y][j - 1];
-      }
-      else //remove channels: merge leftover channels with last kept channel
+      } else    // remove channels: merge leftover channels with last kept
+        // channel
       {
         val = 0;
         for (c = 0; c < channels - 1; c++, i++, j++)
-          ppData[emptyY + y][j] = (unsigned char)(((unsigned long)pFrame->ppData[skipY + y][i] * maxval + pFrame->maxval / 2) / pFrame->maxval);
+          ppData[emptyY + y][j] =
+              (unsigned
+               char)(((unsigned long)pFrame->ppData[skipY + y][i] * maxval +
+                      pFrame->maxval / 2) / pFrame->maxval);
         for (c = channels - 1; c < pFrame->channels; c++, i++)
           val += (unsigned long)pFrame->ppData[skipY + y][i];
         div = pFrame->maxval * (pFrame->channels - channels + 1);
-        ppData[emptyY + y][j++] = (unsigned char)((val * maxval + div / 2) / div);
+        ppData[emptyY + y][j++] =
+            (unsigned char)((val * maxval + div / 2) / div);
       }
     }
   }
@@ -427,83 +476,104 @@ void BlinkenFrameScale( stBlinkenFrame * pFrame, int height, int width )
   if (pFrame == NULL)
     return;
 
-  if( height < BlinkenHeightMin ) height = BlinkenHeightMin;
-  if( height > BlinkenHeightMax ) height = BlinkenHeightMax;
-  if( width < BlinkenWidthMin ) width = BlinkenWidthMin;
-  if( width > BlinkenWidthMax ) width = BlinkenWidthMax;
+  if (height < BlinkenHeightMin)
+    height = BlinkenHeightMin;
+  if (height > BlinkenHeightMax)
+    height = BlinkenHeightMax;
+  if (width < BlinkenWidthMin)
+    width = BlinkenWidthMin;
+  if (width > BlinkenWidthMax)
+    width = BlinkenWidthMax;
 
-  if( height == pFrame->height &&
-      width == pFrame->width )
+  if (height == pFrame->height && width == pFrame->width)
     return;
 
   scaleHor = (double)width / (double)pFrame->width;
   scaleVer = (double)height / (double)pFrame->height;
 
   // allocate new data array
-  ppData = (unsigned char * *)malloc2D( height, width * pFrame->channels, sizeof( unsigned char ) );
+  ppData =
+      (unsigned char **)malloc2D(height, width * pFrame->channels,
+                                 sizeof(unsigned char));
   if (ppData == NULL)
     return;
 
   // scale every channel
   chans = pFrame->channels;
-  for( c = 0; c < chans; c++ )
-  {
-    for( ny = 0; ny < height; ny++ )
-    {
-      for( nx = 0; nx < width; nx++ )
-      {
-        oy = (double)ny / scaleVer; //sub-pixel exact range in old picture
+  for (c = 0; c < chans; c++) {
+    for (ny = 0; ny < height; ny++) {
+      for (nx = 0; nx < width; nx++) {
+        oy = (double)ny / scaleVer;     // sub-pixel exact range in old
+        // picture
         ox = (double)nx / scaleHor;
         oy1 = (double)(ny + 1) / scaleVer - 0.000001;
         ox1 = (double)(nx + 1) / scaleHor - 0.000001;
-        if( oy < 0 || ox < 0 || oy1 >= pFrame->height || ox1 >= pFrame->width) //out of old picture
+        if (oy < 0 || ox < 0 || oy1 >= pFrame->height || ox1 >= pFrame->width)  // out 
+                                                                                // 
+          // of 
+          // old 
+          // picture
           ppData[ny][nx * chans + c] = 0;
-        else
-        {
+        else {
           oyi = (int)oy;
           oxi = (int)ox;
           oy1i = (int)oy1;
           ox1i = (int)ox1;
-          if( oyi == oy1i )
-          {
+          if (oyi == oy1i) {
             if (oxi == ox1i)    // one source pixel
             {
               val = (double)pFrame->ppData[oyi][oxi * chans + c];
-            }
-            else //one line of source pixels
+            } else      // one line of source pixels
             {
-              val = (double)pFrame->ppData[oyi][oxi * chans + c] * (1 - ox + oxi)
-                  + (double)pFrame->ppData[oyi][ox1i * chans + c] * (ox1 - ox1i);
+              val =
+                  (double)pFrame->ppData[oyi][oxi * chans + c] * (1 - ox +
+                                                                  oxi)
+                  + (double)pFrame->ppData[oyi][ox1i * chans + c] * (ox1 -
+                                                                     ox1i);
               for (x = oxi + 1; x < ox1i; x++)
                 val += (double)pFrame->ppData[oyi][x * chans + c];
               val /= ox1 - ox;
             }
-          }
-          else //one column of source pixels
-          {
-            if( oxi == ox1i )
+          } else        // one column of source pixels
           {
-              val = (double)pFrame->ppData[oyi][oxi * chans + c] * (1 - oy + oyi)
-                  + (double)pFrame->ppData[oy1i][oxi * chans + c] * (oy1 - oy1i);
+            if (oxi == ox1i) {
+              val =
+                  (double)pFrame->ppData[oyi][oxi * chans + c] * (1 - oy +
+                                                                  oyi)
+                  + (double)pFrame->ppData[oy1i][oxi * chans + c] * (oy1 -
+                                                                     oy1i);
               for (y = oyi + 1; y < oy1i; y++)
                 val += (double)pFrame->ppData[y][oxi * chans + c];
               val /= oy1 - oy;
-            }
-            else //rectangle of source pixels
-            {
-              val = (double)pFrame->ppData[oyi][oxi* chans + c] * (1 - oy + oyi) * (1 - ox + oxi)
-                  + (double)pFrame->ppData[oyi][ox1i * chans + c] * (1 - oy + oyi) * (ox1 - ox1i)
-                  + (double)pFrame->ppData[oy1i][oxi * chans + c] * (oy1 - oy1i) * (1 - ox + oxi)
-                  + (double)pFrame->ppData[oy1i][ox1i * chans + c] * (oy1 - oy1i) * (ox1 - ox1i);
-              for( y = oyi + 1; y < oy1i; y++ )
-              {
-                val += (double)pFrame->ppData[y][oxi * chans + c] * (1 - ox + oxi)
-                     + (double)pFrame->ppData[y][ox1i * chans + c] * (ox1 - ox1i);
-              }
-              for( x = oxi + 1; x < ox1i; x++ )
-              {
-                val += (double)pFrame->ppData[oyi][x * chans + c] * (1 - oy + oyi)
-                     + (double)pFrame->ppData[oy1i][x * chans + c] * (oy1 - oy1i);
+            } else      // rectangle of source pixels
+            {
+              val =
+                  (double)pFrame->ppData[oyi][oxi * chans + c] * (1 - oy +
+                                                                  oyi) * (1 -
+                                                                          ox +
+                                                                          oxi)
+                  + (double)pFrame->ppData[oyi][ox1i * chans + c] * (1 - oy +
+                                                                     oyi) *
+                  (ox1 - ox1i)
+                  + (double)pFrame->ppData[oy1i][oxi * chans + c] * (oy1 -
+                                                                     oy1i) *
+                  (1 - ox + oxi)
+                  + (double)pFrame->ppData[oy1i][ox1i * chans + c] * (oy1 -
+                                                                      oy1i) *
+                  (ox1 - ox1i);
+              for (y = oyi + 1; y < oy1i; y++) {
+                val +=
+                    (double)pFrame->ppData[y][oxi * chans + c] * (1 - ox +
+                                                                  oxi)
+                    + (double)pFrame->ppData[y][ox1i * chans + c] * (ox1 -
+                                                                     ox1i);
+              }
+              for (x = oxi + 1; x < ox1i; x++) {
+                val +=
+                    (double)pFrame->ppData[oyi][x * chans + c] * (1 - oy +
+                                                                  oyi)
+                    + (double)pFrame->ppData[oy1i][x * chans + c] * (oy1 -
+                                                                     oy1i);
               }
               for (y = oyi + 1; y < oy1i; y++)
                 for (x = oxi + 1; x < ox1i; x++)
@@ -523,7 +593,8 @@ void BlinkenFrameScale( stBlinkenFrame * pFrame, int height, int width )
   pFrame->ppData = ppData;
 }
 
-void BlinkenFrameColorize( stBlinkenFrame * pFrame, int channels, int mode, int step )
+void BlinkenFrameColorize(stBlinkenFrame * pFrame, int channels, int mode,
+                          int step)
 {
   unsigned char **ppData;
   int y, x, c, i, j;
@@ -532,11 +603,15 @@ void BlinkenFrameColorize( stBlinkenFrame * pFrame, int channels, int mode, int
   if (pFrame == NULL)
     return;
 
-  if( channels < BlinkenChannelsMin ) channels = BlinkenChannelsMin;
-  if( channels > BlinkenChannelsMax ) channels = BlinkenMaxvalMax;
+  if (channels < BlinkenChannelsMin)
+    channels = BlinkenChannelsMin;
+  if (channels > BlinkenChannelsMax)
+    channels = BlinkenMaxvalMax;
 
   // allocate new data array
-  ppData = (unsigned char * *)malloc2D( pFrame->height, pFrame->width * channels, sizeof( unsigned char ) );
+  ppData =
+      (unsigned char **)malloc2D(pFrame->height, pFrame->width * channels,
+                                 sizeof(unsigned char));
   if (ppData == NULL)
     return;
   for (y = 0; y < pFrame->height; y++)
@@ -545,10 +620,8 @@ void BlinkenFrameColorize( stBlinkenFrame * pFrame, int channels, int mode, int
         ppData[y][i] = 0;
 
   // colorize frame
-  for( y = 0; y < pFrame->height; y++ )
-  {
-    for( x = 0; x < pFrame->width; x++ )
-    {
+  for (y = 0; y < pFrame->height; y++) {
+    for (x = 0; x < pFrame->width; x++) {
       i = x * pFrame->channels;
       // merge channels
       val = 0;
@@ -588,10 +661,8 @@ char * BlinkenFrameToString( stBlinkenFrame * pFrame )
 
   ptr = str;
 
-  for( y = 0; y < pFrame->height; y++ )
-  {
-    for( x = 0, i = 0; x < pFrame->width; x++ )
-    {
+  for (y = 0; y < pFrame->height; y++) {
+    for (x = 0, i = 0; x < pFrame->width; x++) {
       val = 0;
       for (val = 0, c = 0; c < pFrame->channels; c++, i++)
         val += pFrame->ppData[y][i];
@@ -608,7 +679,8 @@ char * BlinkenFrameToString( stBlinkenFrame * pFrame )
   return str;
 }
 
-int BlinkenFrameToNetwork( stBlinkenFrame * pFrame, etBlinkenProto proto, char * pData, int maxLength )
+int BlinkenFrameToNetwork(stBlinkenFrame * pFrame, etBlinkenProto proto,
+                          char *pData, int maxLength)
 // returns length or -1 on error
 {
   int y, x, c, i, j, val;
@@ -616,62 +688,81 @@ int BlinkenFrameToNetwork( stBlinkenFrame * pFrame, etBlinkenProto proto, char *
   if (pFrame == NULL)
     return -1;
 
-  switch( proto )
-  {
+  switch (proto) {
 
   case BlinkenProtoNone:
     return 0;
 
   case BlinkenProtoBlp:
-      if( maxLength < (int)sizeof( stBlinkenProtoBlpHdr ) + pFrame->height * pFrame->width ) //buffer too short
+    if (maxLength < (int)sizeof(stBlinkenProtoBlpHdr) + pFrame->height * pFrame->width) // buffer 
+                                                                                        // 
+      // too 
+      // short
       return -1;
-      ((stBlinkenProtoBlpHdr *)pData)->magic = htonl( BlinkenProtoBlpMagic ); //build header
+    ((stBlinkenProtoBlpHdr *) pData)->magic = htonl(BlinkenProtoBlpMagic);      // build 
+                                                                                // 
+    // header
     ((stBlinkenProtoBlpHdr *) pData)->frameNo = htonl(0);
     ((stBlinkenProtoBlpHdr *) pData)->width = htons((uint16_t) pFrame->width);
-      ((stBlinkenProtoBlpHdr *)pData)->height = htons( (uint16_t)pFrame->height );
+    ((stBlinkenProtoBlpHdr *) pData)->height =
+        htons((uint16_t) pFrame->height);
     i = sizeof(stBlinkenProtoBlpHdr);   // put data into packet
-      for( y = 0; y < pFrame->height; y++ )
-      {
-        for( x = 0, j = 0; x < pFrame->width; x++, i++ )
-        {
+    for (y = 0; y < pFrame->height; y++) {
+      for (x = 0, j = 0; x < pFrame->width; x++, i++) {
         val = 0;
         for (c = 0; c < pFrame->channels; c++, j++)
           val += pFrame->ppData[y][j];
-           pData[i] = (val >= pFrame->channels * pFrame->maxval / 2 ? 0x01 : 0x00);
+        pData[i] =
+            (val >= pFrame->channels * pFrame->maxval / 2 ? 0x01 : 0x00);
       }
     }
     return i;   // return length
 
   case BlinkenProtoEblp:
-      if( maxLength < (int)sizeof( stBlinkenProtoEblpHdr ) + pFrame->height * pFrame->width ) //buffer too short
+    if (maxLength < (int)sizeof(stBlinkenProtoEblpHdr) + pFrame->height * pFrame->width)        // buffer 
+                                                                                                // 
+      // too 
+      // short
       return -1;
-      ((stBlinkenProtoEblpHdr *)pData)->magic = htonl( BlinkenProtoEblpMagic ); //build header
+    ((stBlinkenProtoEblpHdr *) pData)->magic = htonl(BlinkenProtoEblpMagic);    // build 
+                                                                                // 
+    // header
     ((stBlinkenProtoEblpHdr *) pData)->frameNo = htonl(0);
-      ((stBlinkenProtoEblpHdr *)pData)->width = htons( (uint16_t)pFrame->width );
-      ((stBlinkenProtoEblpHdr *)pData)->height = htons( (uint16_t)pFrame->height );
+    ((stBlinkenProtoEblpHdr *) pData)->width =
+        htons((uint16_t) pFrame->width);
+    ((stBlinkenProtoEblpHdr *) pData)->height =
+        htons((uint16_t) pFrame->height);
     i = sizeof(stBlinkenProtoEblpHdr);  // put data into packet
-      for( y = 0; y < pFrame->height; y++ )
-      {
-        for( x = 0, j = 0; x < pFrame->width; x++, i++ )
-        {
+    for (y = 0; y < pFrame->height; y++) {
+      for (x = 0, j = 0; x < pFrame->width; x++, i++) {
         val = 0;
         for (c = 0; c < pFrame->channels; c++, j++)
           val += pFrame->ppData[y][j];
         val /= pFrame->channels;
         pData[i] = (pFrame->maxval == 255 ? (unsigned char)val
-                                             : (unsigned char)((val * 255 + pFrame->maxval / 2) / pFrame->maxval));
+                    : (unsigned char)((val * 255 + pFrame->maxval / 2) /
+                                      pFrame->maxval));
       }
     }
     return i;   // return length
 
   case BlinkenProtoMcuf:
-      if( maxLength < (int)sizeof( stBlinkenProtoMcufHdr ) + pFrame->height * pFrame->width * pFrame->channels ) //buffer too short
+    if (maxLength < (int)sizeof(stBlinkenProtoMcufHdr) + pFrame->height * pFrame->width * pFrame->channels)     // buffer 
+                                                                                                                // 
+      // too 
+      // short
       return -1;
-      ((stBlinkenProtoMcufHdr *)pData)->magic = htonl( BlinkenProtoMcufMagic ); //build header
-      ((stBlinkenProtoMcufHdr *)pData)->height = htons( (uint16_t)pFrame->height );
-      ((stBlinkenProtoMcufHdr *)pData)->width = htons( (uint16_t)pFrame->width );
-      ((stBlinkenProtoMcufHdr *)pData)->channels = htons( (uint16_t)pFrame->channels );
-      ((stBlinkenProtoMcufHdr *)pData)->maxval = htons( (uint16_t)pFrame->maxval );
+    ((stBlinkenProtoMcufHdr *) pData)->magic = htonl(BlinkenProtoMcufMagic);    // build 
+                                                                                // 
+    // header
+    ((stBlinkenProtoMcufHdr *) pData)->height =
+        htons((uint16_t) pFrame->height);
+    ((stBlinkenProtoMcufHdr *) pData)->width =
+        htons((uint16_t) pFrame->width);
+    ((stBlinkenProtoMcufHdr *) pData)->channels =
+        htons((uint16_t) pFrame->channels);
+    ((stBlinkenProtoMcufHdr *) pData)->maxval =
+        htons((uint16_t) pFrame->maxval);
     i = sizeof(stBlinkenProtoMcufHdr);  // put data into packet
     for (y = 0; y < pFrame->height; y++)
       for (x = 0, j = 0; x < pFrame->width; x++)
@@ -685,7 +776,8 @@ int BlinkenFrameToNetwork( stBlinkenFrame * pFrame, etBlinkenProto proto, char *
   }
 }
 
-stBlinkenFrame * BlinkenFrameFromNetwork( char * pData, int length, etBlinkenProto * pProto )
+stBlinkenFrame *BlinkenFrameFromNetwork(char *pData, int length,
+                                        etBlinkenProto * pProto)
 // returns protocol in *pProto if pProto not NULL
 {
   stBlinkenFrame *pFrame;
@@ -696,14 +788,25 @@ stBlinkenFrame * BlinkenFrameFromNetwork( char * pData, int length, etBlinkenPro
   {
     if (pProto != NULL) // return protocol
       *pProto = BlinkenProtoBlp;
-    height = ntohs( ((stBlinkenProtoBlpHdr *)pData)->height ); //get header data
+    height = ntohs(((stBlinkenProtoBlpHdr *) pData)->height);   // get header 
+                                                                // 
+    // data
     width = ntohs(((stBlinkenProtoBlpHdr *) pData)->width);
-    if( length < (int)sizeof( stBlinkenProtoBlpHdr ) + height * width ) //check length of packet
+    if (length < (int)sizeof(stBlinkenProtoBlpHdr) + height * width)    // check 
+                                                                        // 
+      // length 
+      // of 
+      // packet
       return NULL;
-    if( height < BlinkenHeightMin || height > BlinkenHeightMax || //check header data
+    if (height < BlinkenHeightMin || height > BlinkenHeightMax ||       // check 
+                                                                        // 
+        // header 
+        // data
         width < BlinkenWidthMin || width > BlinkenWidthMax)
       return NULL;
-    pFrame = BlinkenFrameNew( height, width, 1, 1, 0 ); //create frame according to header data
+    pFrame = BlinkenFrameNew(height, width, 1, 1, 0);   // create frame
+    // according to
+    // header data
     if (pFrame == NULL)
       return NULL;
     i = sizeof(stBlinkenProtoBlpHdr);   // put data into frame
@@ -714,18 +817,29 @@ stBlinkenFrame * BlinkenFrameFromNetwork( char * pData, int length, etBlinkenPro
   }
 
   if (length >= (int)sizeof(stBlinkenProtoEblpHdr) &&
-      ((stBlinkenProtoEblpHdr *)pData)->magic == htonl( BlinkenProtoEblpMagic ) )
-  {
+      ((stBlinkenProtoEblpHdr *) pData)->magic ==
+      htonl(BlinkenProtoEblpMagic)) {
     if (pProto != NULL) // return protocol
       *pProto = BlinkenProtoEblp;
-    height = ntohs( ((stBlinkenProtoEblpHdr *)pData)->height ); //get header data
+    height = ntohs(((stBlinkenProtoEblpHdr *) pData)->height);  // get header 
+                                                                // 
+    // data
     width = ntohs(((stBlinkenProtoEblpHdr *) pData)->width);
-    if( length < (int)sizeof( stBlinkenProtoEblpHdr ) + width * height ) //check length of packet
+    if (length < (int)sizeof(stBlinkenProtoEblpHdr) + width * height)   // check 
+                                                                        // 
+      // length 
+      // of 
+      // packet
       return NULL;
-    if( height < BlinkenHeightMin || height > BlinkenHeightMax || //check header data
+    if (height < BlinkenHeightMin || height > BlinkenHeightMax ||       // check 
+                                                                        // 
+        // header 
+        // data
         width < BlinkenWidthMin || width > BlinkenWidthMax)
       return NULL;
-    pFrame = BlinkenFrameNew( height, width, 1, 255, 0 ); //create frame according to header data
+    pFrame = BlinkenFrameNew(height, width, 1, 255, 0); // create frame
+    // according to
+    // header data
     if (pFrame == NULL)
       return NULL;
     i = sizeof(stBlinkenProtoEblpHdr);  // put data into frame
@@ -736,22 +850,37 @@ stBlinkenFrame * BlinkenFrameFromNetwork( char * pData, int length, etBlinkenPro
   }
 
   if (length >= (int)sizeof(stBlinkenProtoMcufHdr) &&
-      ((stBlinkenProtoMcufHdr *)pData)->magic == htonl( BlinkenProtoMcufMagic ) )
-  {
+      ((stBlinkenProtoMcufHdr *) pData)->magic ==
+      htonl(BlinkenProtoMcufMagic)) {
     if (pProto != NULL) // return protocol
       *pProto = BlinkenProtoMcuf;
-    height = ntohs( ((stBlinkenProtoMcufHdr *)pData)->height ); //get header data
+    height = ntohs(((stBlinkenProtoMcufHdr *) pData)->height);  // get header 
+                                                                // 
+    // data
     width = ntohs(((stBlinkenProtoMcufHdr *) pData)->width);
     channels = ntohs(((stBlinkenProtoMcufHdr *) pData)->channels);
     maxval = ntohs(((stBlinkenProtoMcufHdr *) pData)->maxval);
-    if( length < (int)sizeof( stBlinkenProtoMcufHdr ) + height * width * channels ) //check length of packet
+    if (length < (int)sizeof(stBlinkenProtoMcufHdr) + height * width * channels)        // check 
+                                                                                        // 
+      // length 
+      // of 
+      // packet
       return NULL;
-    if( height < BlinkenHeightMin || height > BlinkenHeightMax || //check header data
+    if (height < BlinkenHeightMin || height > BlinkenHeightMax ||       // check 
+                                                                        // 
+        // header 
+        // data
         width < BlinkenWidthMin || width > BlinkenWidthMax ||
         channels < BlinkenChannelsMin || channels > BlinkenChannelsMax ||
         maxval < BlinkenMaxvalMin || maxval > BlinkenMaxvalMax)
       return NULL;
-    pFrame = BlinkenFrameNew( height, width, channels, maxval, 0 ); //create frame according to header data
+    pFrame = BlinkenFrameNew(height, width, channels, maxval, 0);       // create 
+                                                                        // 
+    // frame 
+    // according 
+    // to 
+    // header 
+    // data
     if (pFrame == NULL)
       return NULL;
     i = sizeof(stBlinkenProtoMcufHdr);  // put data into frame

BlinkenLib/BlinkenFrame.h

View file @ 142b777

@@ -1,17 +1,18 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #ifndef INC_BlinkenLib_BlinkenFrame
 #define INC_BlinkenLib_BlinkenFrame
 
 typedef struct sBlinkenFrame stBlinkenFrame;
 
-typedef enum eBlinkenProto { BlinkenProtoNone, BlinkenProtoBlp, BlinkenProtoEblp, BlinkenProtoMcuf } etBlinkenProto;
+typedef enum eBlinkenProto { BlinkenProtoNone, BlinkenProtoBlp,
+  BlinkenProtoEblp, BlinkenProtoMcuf
+} etBlinkenProto;
 
-stBlinkenFrame * BlinkenFrameNew( int height, int width, int channels, int maxval, int duration );
+stBlinkenFrame *BlinkenFrameNew(int height, int width, int channels,
+                                int maxval, int duration);
 
 stBlinkenFrame *BlinkenFrameClone(stBlinkenFrame * pSrcFrame);
 
@@ -27,11 +28,14 @@ int BlinkenFrameGetMaxval( stBlinkenFrame * pFrame );
 int BlinkenFrameGetDuration(stBlinkenFrame * pFrame);
 void BlinkenFrameSetDuration(stBlinkenFrame * pFrame, int duration);
 
-unsigned char BlinkenFrameGetPixel( stBlinkenFrame * pFrame, int y, int x, int c );
-void BlinkenFrameSetPixel( stBlinkenFrame * pFrame, int y, int x, int c, unsigned char val );
+unsigned char BlinkenFrameGetPixel(stBlinkenFrame * pFrame, int y, int x,
+                                   int c);
+void BlinkenFrameSetPixel(stBlinkenFrame * pFrame, int y, int x, int c,
+                          unsigned char val);
 
 unsigned long BlinkenFrameGetColor(stBlinkenFrame * pFrame, int y, int x);
-void BlinkenFrameSetColor( stBlinkenFrame * pFrame, int y, int x, unsigned long color );
+void BlinkenFrameSetColor(stBlinkenFrame * pFrame, int y, int x,
+                          unsigned long color);
 
 int BlinkenFrameIsEmpty(stBlinkenFrame * pFrame);
 // returns 1 if frame is empty (i.e. black), returns 0 otherwise
@@ -39,16 +43,20 @@ int BlinkenFrameIsEmpty( stBlinkenFrame * pFrame );
 int BlinkenFrameCompare(stBlinkenFrame * pFrame1, stBlinkenFrame * pFrame2);
 // returns -1 for frame1 smaller, 0 for equal, 1 for frame2 smaller
 
-void BlinkenFrameResize( stBlinkenFrame * pFrame, int height, int width, int channels, int maxval );
+void BlinkenFrameResize(stBlinkenFrame * pFrame, int height, int width,
+                        int channels, int maxval);
 void BlinkenFrameScale(stBlinkenFrame * pFrame, int height, int width);
-void BlinkenFrameColorize( stBlinkenFrame * pFrame, int channels, int mode, int step );
+void BlinkenFrameColorize(stBlinkenFrame * pFrame, int channels, int mode,
+                          int step);
 
 char *BlinkenFrameToString(stBlinkenFrame * pFrame);
 
-int BlinkenFrameToNetwork( stBlinkenFrame * pFrame, etBlinkenProto proto, char * pData, int maxLength );
+int BlinkenFrameToNetwork(stBlinkenFrame * pFrame, etBlinkenProto proto,
+                          char *pData, int maxLength);
 // returns length or -1 on error
 
-stBlinkenFrame * BlinkenFrameFromNetwork( char * pData, int length, etBlinkenProto * pProto );
+stBlinkenFrame *BlinkenFrameFromNetwork(char *pData, int length,
+                                        etBlinkenProto * pProto);
 // returns protocol in *pProto if pProto not NULL
 
 #endif // #ifndef INC_BlinkenLib_BlinkenFrame

BlinkenLib/BlinkenLib.h

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #ifndef INC_BlinkenLib_BlinkenLib
 #define INC_BlinkenLib_BlinkenLib

BlinkenLib/BlinkenMng.c

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,9 +26,11 @@ typedef struct _BlMng_userdata {
   FILE *hFile;  // handle of open file
   unsigned int width;   // size of canvas
   unsigned int height;
-  unsigned char * canvas; // canvas (i.e. pixel data, size is height * width * 3)
+  unsigned char *canvas;        // canvas (i.e. pixel data, size is height *
+  // width * 3)
   unsigned int counter_msec;    // current number of milliseconds
-  unsigned int timer_msec; // the MNG library will be called after this number of milliseconds
+  unsigned int timer_msec;      // the MNG library will be called after this
+  // number of milliseconds
   stBlinkenMovie *movie;        // movie being created
 } BlMng_userdata;
 
@@ -58,7 +58,8 @@ mng_bool BlMng_closestream( mng_handle __attribute__(( unused )) hMNG )
 }
 
 // read data from the open file
-mng_bool BlMng_readdata( mng_handle hMNG, mng_ptr pBuf, mng_uint32 iSize, mng_uint32 * iRead )
+mng_bool BlMng_readdata(mng_handle hMNG, mng_ptr pBuf, mng_uint32 iSize,
+                        mng_uint32 * iRead)
 {
   BlMng_userdata *data = (BlMng_userdata *) mng_get_userdata(hMNG);
   *iRead = fread(pBuf, 1, iSize, data->hFile);
@@ -66,7 +67,8 @@ mng_bool BlMng_readdata( mng_handle hMNG, mng_ptr pBuf, mng_uint32 iSize, mng_ui
 }
 
 // write data to the open file
-mng_bool BlMng_writedata( mng_handle hMNG, mng_ptr pBuf, mng_uint32 iSize, mng_uint32 * iWritten )
+mng_bool BlMng_writedata(mng_handle hMNG, mng_ptr pBuf, mng_uint32 iSize,
+                         mng_uint32 * iWritten)
 {
   BlMng_userdata *data = (BlMng_userdata *) mng_get_userdata(hMNG);
   *iWritten = fwrite(pBuf, 1, iSize, data->hFile);
@@ -74,7 +76,8 @@ mng_bool BlMng_writedata( mng_handle hMNG, mng_ptr pBuf, mng_uint32 iSize, mng_u
 }
 
 // MNG library has processed the header information
-mng_bool BlMng_processheader( mng_handle hMNG, mng_uint32 iWidth, mng_uint32 iHeight )
+mng_bool BlMng_processheader(mng_handle hMNG, mng_uint32 iWidth,
+                             mng_uint32 iHeight)
 {
   BlMng_userdata *data = (BlMng_userdata *) mng_get_userdata(hMNG);
 
@@ -101,7 +102,8 @@ mng_bool BlMng_processheader( mng_handle hMNG, mng_uint32 iWidth, mng_uint32 iHe
   data->timer_msec = 0;
 
   // create new empty movie
-  data->movie = BlinkenMovieNew( iHeight, iWidth, 3, 255 ); // always 24 bit RGB
+  data->movie = BlinkenMovieNew(iHeight, iWidth, 3, 255);       // always 24
+  // bit RGB
   if (data->movie == NULL)
     return MNG_FALSE;
 
@@ -121,9 +123,14 @@ mng_ptr BlMng_getcanvasline( mng_handle hMNG, mng_uint32 iLinenr )
 }
 
 // the MNG library thinks that (a part of) the canvas should be shown
-mng_bool BlMng_refresh( mng_handle __attribute__(( unused )) hMNG, mng_uint32 __attribute__(( unused )) iX, mng_uint32 __attribute__(( unused )) iY, mng_uint32 __attribute__(( unused )) iWidth, mng_uint32 __attribute__(( unused )) iHeight )
+mng_bool BlMng_refresh(mng_handle __attribute__ ((unused)) hMNG, mng_uint32
+                       __attribute__ ((unused)) iX, mng_uint32
+                       __attribute__ ((unused)) iY, mng_uint32
+                       __attribute__ ((unused)) iWidth, mng_uint32
+                       __attribute__ ((unused)) iHeight)
 {
-  // nothing to do here for BlinkenLib as we are only converting and not displaying
+  // nothing to do here for BlinkenLib as we are only converting and not
+  // displaying
   return MNG_TRUE;
 }
 
@@ -132,7 +139,8 @@ mng_uint32 BlMng_gettickcount( mng_handle hMNG )
 {
   BlMng_userdata *data = (BlMng_userdata *) mng_get_userdata(hMNG);
 
-  // just return the current number of milliseconds (only converting, do not use real time for this)
+  // just return the current number of milliseconds (only converting, do not
+  // use real time for this)
   return data->counter_msec;
 }
 
@@ -148,7 +156,9 @@ mng_bool BlMng_settimer( mng_handle hMNG, mng_uint32 iMsecs )
 }
 
 // save as new frame to current movie
-void BlMng_save_frame( stBlinkenMovie * movie, unsigned int msec, unsigned int width, unsigned int height, unsigned char * data )
+void BlMng_save_frame(stBlinkenMovie * movie, unsigned int msec,
+                      unsigned int width, unsigned int height,
+                      unsigned char *data)
 {
   stBlinkenFrame *frame;
   unsigned int c, x, y;
@@ -178,11 +188,13 @@ void BlMng_save_frame( stBlinkenMovie * movie, unsigned int msec, unsigned int w
 }
 
 // compress pixel data in a frame
-void BlMng_compress_frame( stBlinkenFrame * frame, unsigned char * * p_out_ptr, unsigned int * p_out_len )
+void BlMng_compress_frame(stBlinkenFrame * frame, unsigned char **p_out_ptr,
+                          unsigned int *p_out_len)
 {
   unsigned int width = BlinkenFrameGetWidth(frame);
   unsigned int height = BlinkenFrameGetHeight(frame);
-  // channels is always 3, maxval is always 255 - this function is only called with frames from moivies with those parameters
+  // channels is always 3, maxval is always 255 - this function is only
+  // called with frames from moivies with those parameters
   unsigned int row_stride, raw_len, y, x, c;
   unsigned char *raw_ptr, *ptr, *out_ptr;
   unsigned long out_len;
@@ -206,7 +218,9 @@ void BlMng_compress_frame( stBlinkenFrame * frame, unsigned char * * p_out_ptr,
   }     // for( y ...
 
   // compress data
-  out_len = raw_len + (raw_len + 999) / 1000 + 12; // must be at least <source length> * 1.001 + 12
+  out_len = raw_len + (raw_len + 999) / 1000 + 12;      // must be at least
+  // <source length> *
+  // 1.001 + 12
   out_ptr = (unsigned char *)malloc(out_len);
   compress2(out_ptr, &out_len, raw_ptr, raw_len, Z_BEST_COMPRESSION);
   free(raw_ptr);
@@ -242,7 +254,8 @@ stBlinkenMovie * BlinkenMngLoad( char * pFilename )
     if (data->hFile != NULL) {
 
       // initialize MNG library
-      hMNG = mng_initialize( (mng_ptr)data, BlMng_alloc, BlMng_free, MNG_NULL );
+      hMNG =
+          mng_initialize((mng_ptr) data, BlMng_alloc, BlMng_free, MNG_NULL);
       if (hMNG) {
 
         // set MNG callbacks
@@ -270,7 +283,8 @@ stBlinkenMovie * BlinkenMngLoad( char * pFilename )
               while (iRC == MNG_NEEDTIMERWAIT && data->timer_msec > 0) {
 
                 // save fame to movie
-                BlMng_save_frame( data->movie, data->timer_msec, data->width, data->height, data->canvas );
+                BlMng_save_frame(data->movie, data->timer_msec, data->width,
+                                 data->height, data->canvas);
                 b_saved = 1;
                 ++frame_idx;
 
@@ -285,18 +299,28 @@ stBlinkenMovie * BlinkenMngLoad( char * pFilename )
 
               } // while( iRC == MNG_NEEDTIMERWAIT && data->timer_msec > 0 )
 
-              // save single frame if no frame saved yet (i.e. not an animated MNG image)
+              // save single frame if no frame saved yet (i.e. not an
+              // animated MNG image)
               if (!b_saved)
-                BlMng_save_frame( data->movie, data->timer_msec, data->width, data->height, data->canvas );
-
-              // if movie has more than one frame and the last frame is empty with duration of 1ms, remove last frame
-              //  - a black frame with 1ms duration is inserted by MNG library when MNG requests to clean canvas after displaying
-              //    - the reqauest to clear canvas after end of MNG anmation is needed to preserve duration of last frame (when converting from native format to MNG)
-              //  - remove this frame that is created by the described side effect
+                BlMng_save_frame(data->movie, data->timer_msec, data->width,
+                                 data->height, data->canvas);
+
+              // if movie has more than one frame and the last frame is empty 
+              // 
+              // with duration of 1ms, remove last frame
+              // - a black frame with 1ms duration is inserted by MNG library 
+              // 
+              // when MNG requests to clean canvas after displaying
+              // - the reqauest to clear canvas after end of MNG anmation is
+              // needed to preserve duration of last frame (when converting
+              // from native format to MNG)
+              // - remove this frame that is created by the described side
+              // effect
               {
                 unsigned int frame_cnt = BlinkenMovieGetFrameCnt(data->movie);
                 if (frame_cnt >= 1) {
-                  stBlinkenFrame * frame = BlinkenMovieGetFrame( data->movie, frame_cnt - 1 );
+                  stBlinkenFrame *frame =
+                      BlinkenMovieGetFrame(data->movie, frame_cnt - 1);
                   if (frame != NULL && BlinkenFrameIsEmpty(frame))
                     BlinkenMovieDeleteFrame(data->movie, frame_cnt - 1);
                 }
@@ -363,7 +387,8 @@ int BlinkenMngSave( stBlinkenMovie * pMovie, char * pFilename )
       if (data->hFile != NULL) {
 
         // initialize MNG library
-        hMNG = mng_initialize( (mng_ptr)data, BlMng_alloc, BlMng_free, MNG_NULL );
+        hMNG =
+            mng_initialize((mng_ptr) data, BlMng_alloc, BlMng_free, MNG_NULL);
         if (hMNG) {
 
           // set MNG callbacks
@@ -377,29 +402,44 @@ int BlinkenMngSave( stBlinkenMovie * pMovie, char * pFilename )
               // write MNG chunks
               do {
                 unsigned int frame_cnt = BlinkenMovieGetFrameCnt(data->movie);
-                unsigned int total_duration = BlinkenMovieGetDuration( data->movie );
+                unsigned int total_duration =
+                    BlinkenMovieGetDuration(data->movie);
                 unsigned int frame_no;
 
                 // write MG header chunks
-                if( mng_putchunk_mhdr( hMNG,
-                                       data->width, data->height, // dimensions
-                                       1000, 0, frame_cnt, total_duration, // ticks per second, layer, frame count, duration
+                if (mng_putchunk_mhdr(hMNG, data->width, data->height,  // dimensions
+                                      1000, 0, frame_cnt, total_duration,       // ticks 
+                                                                                // 
+                                      // per 
+                                      // second, 
+                                      // layer, 
+                                      // frame 
+                                      // count, 
+                                      // duration
                                       MNG_SIMPLICITY_VALID | MNG_SIMPLICITY_SIMPLEFEATURES | MNG_SIMPLICITY_COMPLEXFEATURES     // simplicity
                     ) != 0)
                   break;
 
-                if( mng_putchunk_save( hMNG,
-                                       MNG_TRUE, // empty SAVE chunk
+                if (mng_putchunk_save(hMNG, MNG_TRUE,   // empty SAVE chunk
                                       0, 0      // no offset, no count
                     ) != 0)
                   break;
 
                 // tell MNG player to clear canvas after end of MNG animation
                 // - this is needed to preserve duration of last frame
-                //  - this results in a black frame with 1ms duration at the end of the MNG as side effect
-                if( mng_putchunk_term( hMNG,
-                                       MNG_TERMACTION_CLEAR, MNG_ITERACTION_CLEAR, // show last frame forever after end of animation
-                                       0, 0 // no repeat delay, no maximum iteration count
+                // - this results in a black frame with 1ms duration at the
+                // end of the MNG as side effect
+                if (mng_putchunk_term(hMNG, MNG_TERMACTION_CLEAR, MNG_ITERACTION_CLEAR, // show 
+                                                                                        // 
+                                      // last 
+                                      // frame 
+                                      // forever 
+                                      // after 
+                                      // end 
+                                      // of 
+                                      // animation
+                                      0, 0      // no repeat delay, no
+                                      // maximum iteration count
                     ) != 0)
                   break;
 
@@ -407,35 +447,57 @@ int BlinkenMngSave( stBlinkenMovie * pMovie, char * pFilename )
                 for (frame_no = 0; frame_no < frame_cnt; frame_no++) {
 
                   // get current frame
-                  stBlinkenFrame * frame = BlinkenMovieGetFrame( data->movie, frame_no );
-                  unsigned int frame_duration = BlinkenFrameGetDuration( frame );
+                  stBlinkenFrame *frame =
+                      BlinkenMovieGetFrame(data->movie, frame_no);
+                  unsigned int frame_duration =
+                      BlinkenFrameGetDuration(frame);
 
                   // write MNG frame header chunks
-                  if( mng_putchunk_seek( hMNG,
-                                         0, MNG_NULL // no name
+                  if (mng_putchunk_seek(hMNG, 0, MNG_NULL       // no name
                       ) != 0)
                     break;
 
-                  if( mng_putchunk_fram( hMNG,
-                                         MNG_FALSE, frame_no == 0 ? MNG_FRAMINGMODE_1 : MNG_FRAMINGMODE_NOCHANGE, // empty, mode
+                  if (mng_putchunk_fram(hMNG, MNG_FALSE, frame_no == 0 ? MNG_FRAMINGMODE_1 : MNG_FRAMINGMODE_NOCHANGE,  // empty, 
+                                                                                                                        // 
+                                        // mode
                                         0, MNG_NULL,    // frame name
-                                         MNG_CHANGEDELAY_DEFAULT, MNG_CHANGETIMOUT_NO, MNG_CHANGECLIPPING_NO, MNG_CHANGESYNCID_NO, // changing only delay
-                                         frame_duration, 0, // new delay, no new timeout
+                                        MNG_CHANGEDELAY_DEFAULT, MNG_CHANGETIMOUT_NO, MNG_CHANGECLIPPING_NO, MNG_CHANGESYNCID_NO,       // changing 
+                                                                                                                                        // 
+                                        // only 
+                                        // delay
+                                        frame_duration, 0,      // new delay, 
+                                                                // 
+                                        // no new
+                                        // timeout
                                         0, 0, 0, 0, 0,  // no new boundary
                                         0, 0    // no count, no IDs
                       ) != 0)
                     break;
 
-                  if( mng_putchunk_defi( hMNG,
-                                         0, MNG_DONOTSHOW_VISIBLE, MNG_ABSTRACT, // no ID, visible, abstract
+                  if (mng_putchunk_defi(hMNG, 0, MNG_DONOTSHOW_VISIBLE, MNG_ABSTRACT,   // no 
+                                                                                        // 
+                                        // ID, 
+                                        // visible, 
+                                        // abstract
                                         MNG_TRUE, 0, 0, // top left location
-                                         MNG_FALSE, 0, 0, 0, 0 // no clipping
+                                        MNG_FALSE, 0, 0, 0, 0   // no
+                                        // clipping
                       ) != 0)
                     break;
 
-                  if( mng_putchunk_ihdr( hMNG,
-                                         data->width, data->height, 8, MNG_COLORTYPE_RGB, // dimensions and 8 bit RGB
-                                         MNG_COMPRESSION_DEFLATE, MNG_FILTER_ADAPTIVE, MNG_INTERLACE_NONE // deflate compression, adaptive filter, no interlacing
+                  if (mng_putchunk_ihdr(hMNG, data->width, data->height, 8, MNG_COLORTYPE_RGB,  // dimensions 
+                                                                                                // 
+                                        // and 
+                                        // 8 
+                                        // bit 
+                                        // RGB
+                                        MNG_COMPRESSION_DEFLATE, MNG_FILTER_ADAPTIVE, MNG_INTERLACE_NONE        // deflate 
+                                                                                                                // 
+                                        // compression, 
+                                        // adaptive 
+                                        // filter, 
+                                        // no 
+                                        // interlacing
                       ) != 0)
                     break;
 
@@ -447,7 +509,9 @@ int BlinkenMngSave( stBlinkenMovie * pMovie, char * pFilename )
 
                     BlMng_compress_frame(frame, &ptr, &len);
 
-                    iRC = mng_putchunk_idat( hMNG, (mng_uint32)len, (mng_ptr)ptr );
+                    iRC =
+                        mng_putchunk_idat(hMNG, (mng_uint32) len,
+                                          (mng_ptr) ptr);
                     free(ptr);
                     if (iRC != 0)
                       break;
@@ -458,7 +522,9 @@ int BlinkenMngSave( stBlinkenMovie * pMovie, char * pFilename )
                     break;
 
                 }       // for( frame ...
-                if( frame_no < frame_cnt ) // if not all frames have been processed there was en error
+                if (frame_no < frame_cnt)       // if not all frames have
+                  // been processed there was
+                  // en error
                   break;
 
                 // output MNG end chunk

BlinkenLib/BlinkenMng.h

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #ifndef INC_BlinkenLib_BlinkenMng
 #define INC_BlinkenLib_BlinkenMng

BlinkenLib/BlinkenMovie.c

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,8 +24,7 @@
 #include <BlinkenLib/BlinkenMng.h>
 #endif // #ifdef BLINKENLIB_CFG_MNG
 
-struct sBlinkenMovie
-{
+struct sBlinkenMovie {
   int height;
   int width;
   int channels;
@@ -66,18 +63,27 @@ static unsigned int get_ms( )
 
 #endif
 
-stBlinkenMovie * BlinkenMovieNew( int height, int width, int channels, int maxval )
+stBlinkenMovie *BlinkenMovieNew(int height, int width, int channels,
+                                int maxval)
 {
   stBlinkenMovie *pMovie;
 
-  if( height < BlinkenHeightMin ) height = BlinkenHeightMin;
-  if( height > BlinkenHeightMax ) height = BlinkenHeightMax;
-  if( width < BlinkenWidthMin ) width = BlinkenWidthMin;
-  if( width > BlinkenWidthMax ) width = BlinkenWidthMax;
-  if( channels < BlinkenChannelsMin ) channels = BlinkenChannelsMin;
-  if( channels > BlinkenChannelsMax ) channels = BlinkenMaxvalMax;
-  if( maxval < BlinkenMaxvalMin ) maxval = BlinkenMaxvalMin;
-  if( maxval > BlinkenMaxvalMax ) maxval = BlinkenMaxvalMax;
+  if (height < BlinkenHeightMin)
+    height = BlinkenHeightMin;
+  if (height > BlinkenHeightMax)
+    height = BlinkenHeightMax;
+  if (width < BlinkenWidthMin)
+    width = BlinkenWidthMin;
+  if (width > BlinkenWidthMax)
+    width = BlinkenWidthMax;
+  if (channels < BlinkenChannelsMin)
+    channels = BlinkenChannelsMin;
+  if (channels > BlinkenChannelsMax)
+    channels = BlinkenMaxvalMax;
+  if (maxval < BlinkenMaxvalMin)
+    maxval = BlinkenMaxvalMin;
+  if (maxval > BlinkenMaxvalMax)
+    maxval = BlinkenMaxvalMax;
 
   pMovie = (stBlinkenMovie *) malloc(sizeof(stBlinkenMovie));
   if (pMovie == NULL)
@@ -89,15 +95,14 @@ stBlinkenMovie * BlinkenMovieNew( int height, int width, int channels, int maxva
   pMovie->maxval = maxval;
   pMovie->infoCnt = 0;
   pMovie->pppInfos = (char ***)malloc2D(0, 2, sizeof(char *));
-  if( pMovie->pppInfos == NULL )
-  {
+  if (pMovie->pppInfos == NULL) {
     free(pMovie);
     return NULL;
   }
   pMovie->frameCnt = 0;
-  pMovie->ppFrames = (stBlinkenFrame * *)malloc1D( 0, sizeof( stBlinkenFrame * ) );
-  if( pMovie->ppFrames == NULL )
-  {
+  pMovie->ppFrames =
+      (stBlinkenFrame **) malloc1D(0, sizeof(stBlinkenFrame *));
+  if (pMovie->ppFrames == NULL) {
     free(pMovie->pppInfos);
     free(pMovie);
     return NULL;
@@ -112,15 +117,17 @@ stBlinkenMovie * BlinkenMovieClone( stBlinkenMovie * pSrcMovie )
   stBlinkenFrame *pFrame;
   int i;
 
-  pMovie = BlinkenMovieNew( pSrcMovie->height, pSrcMovie->width, pSrcMovie->channels, pSrcMovie->maxval );
+  pMovie =
+      BlinkenMovieNew(pSrcMovie->height, pSrcMovie->width,
+                      pSrcMovie->channels, pSrcMovie->maxval);
   if (pMovie == NULL)
     return NULL;
 
   for (i = 0; i < pSrcMovie->infoCnt; i++)
-    BlinkenMovieAppendInfo( pMovie, pSrcMovie->pppInfos[i][0], pSrcMovie->pppInfos[i][1] );
+    BlinkenMovieAppendInfo(pMovie, pSrcMovie->pppInfos[i][0],
+                           pSrcMovie->pppInfos[i][1]);
 
-  for( i = 0; i < pSrcMovie->frameCnt; i++ )
-  {
+  for (i = 0; i < pSrcMovie->frameCnt; i++) {
     pFrame = BlinkenFrameClone(pSrcMovie->ppFrames[i]);
     if (BlinkenMovieAppendFrame(pMovie, pFrame) != 0)
       BlinkenFrameFree(pFrame);
@@ -136,8 +143,7 @@ void BlinkenMovieFree( stBlinkenMovie * pMovie )
   if (pMovie == NULL)
     return;
 
-  for( i = 0; i < pMovie->infoCnt; i++ )
-  {
+  for (i = 0; i < pMovie->infoCnt; i++) {
     free(pMovie->pppInfos[i][0]);
     free(pMovie->pppInfos[i][1]);
   }
@@ -208,8 +214,10 @@ char * BlinkenMovieGetInfoType( stBlinkenMovie * pMovie, int infoNo )
   if (pMovie == NULL || pMovie->infoCnt < 1)
     return "";
 
-  if( infoNo < 0 ) infoNo = 0;
-  if( infoNo >= pMovie->infoCnt ) infoNo = pMovie->infoCnt - 1;
+  if (infoNo < 0)
+    infoNo = 0;
+  if (infoNo >= pMovie->infoCnt)
+    infoNo = pMovie->infoCnt - 1;
   return pMovie->pppInfos[infoNo][0];
 }
 
@@ -218,12 +226,15 @@ char * BlinkenMovieGetInfoData( stBlinkenMovie * pMovie, int infoNo )
   if (pMovie == NULL || pMovie->infoCnt < 1)
     return "";
 
-  if( infoNo < 0 ) infoNo = 0;
-  if( infoNo >= pMovie->infoCnt ) infoNo = pMovie->infoCnt - 1;
+  if (infoNo < 0)
+    infoNo = 0;
+  if (infoNo >= pMovie->infoCnt)
+    infoNo = pMovie->infoCnt - 1;
   return pMovie->pppInfos[infoNo][1];
 }
 
-void BlinkenMovieSetInfo( stBlinkenMovie * pMovie, int infoNo, char * pInfoType, char * pInfoData )
+void BlinkenMovieSetInfo(stBlinkenMovie * pMovie, int infoNo, char *pInfoType,
+                         char *pInfoData)
 {
   char *pType, *pData;
 
@@ -234,8 +245,7 @@ void BlinkenMovieSetInfo( stBlinkenMovie * pMovie, int infoNo, char * pInfoType,
   if (pType == NULL)
     return;
   pData = strdup(pInfoData);
-  if( pData == NULL )
-  {
+  if (pData == NULL) {
     free(pType);
     return;
   }
@@ -246,7 +256,8 @@ void BlinkenMovieSetInfo( stBlinkenMovie * pMovie, int infoNo, char * pInfoType,
   pMovie->pppInfos[infoNo][1] = pData;
 }
 
-void BlinkenMovieInsertInfo( stBlinkenMovie * pMovie, int infoNo, char * pInfoType, char * pInfoData )
+void BlinkenMovieInsertInfo(stBlinkenMovie * pMovie, int infoNo,
+                            char *pInfoType, char *pInfoData)
 {
   char ***pppNewInfos, *pType, *pData;
   int i;
@@ -259,21 +270,18 @@ void BlinkenMovieInsertInfo( stBlinkenMovie * pMovie, int infoNo, char * pInfoTy
     return;
 
   pType = strdup(pInfoType);
-  if( pType == NULL )
-  {
+  if (pType == NULL) {
     free(pppNewInfos);
     return;
   }
   pData = strdup(pInfoData);
-  if( pData == NULL )
-  {
+  if (pData == NULL) {
     free(pppNewInfos);
     free(pType);
     return;
   }
 
-  for( i = 0; i < infoNo; i++ )
-  {
+  for (i = 0; i < infoNo; i++) {
     pppNewInfos[i][0] = pMovie->pppInfos[i][0];
     pppNewInfos[i][1] = pMovie->pppInfos[i][1];
   }
@@ -281,8 +289,7 @@ void BlinkenMovieInsertInfo( stBlinkenMovie * pMovie, int infoNo, char * pInfoTy
   pppNewInfos[infoNo][0] = pType;
   pppNewInfos[infoNo][1] = pData;
 
-  for( i = infoNo; i < pMovie->infoCnt; i++ )
-  {
+  for (i = infoNo; i < pMovie->infoCnt; i++) {
     pppNewInfos[i + 1][0] = pMovie->pppInfos[i][0];
     pppNewInfos[i + 1][1] = pMovie->pppInfos[i][1];
   }
@@ -292,7 +299,8 @@ void BlinkenMovieInsertInfo( stBlinkenMovie * pMovie, int infoNo, char * pInfoTy
   pMovie->infoCnt++;
 }
 
-void BlinkenMovieAppendInfo( stBlinkenMovie * pMovie, char * pInfoType, char * pInfoData )
+void BlinkenMovieAppendInfo(stBlinkenMovie * pMovie, char *pInfoType,
+                            char *pInfoData)
 {
   if (pMovie == NULL)
     return;
@@ -312,8 +320,7 @@ void BlinkenMovieDeleteInfo( stBlinkenMovie * pMovie, int infoNo )
   if (pppNewInfos == NULL)
     return;
 
-  for( i = 0; i < infoNo; i++ )
-  {
+  for (i = 0; i < infoNo; i++) {
     pppNewInfos[i][0] = pMovie->pppInfos[i][0];
     pppNewInfos[i][1] = pMovie->pppInfos[i][1];
   }
@@ -321,8 +328,7 @@ void BlinkenMovieDeleteInfo( stBlinkenMovie * pMovie, int infoNo )
   free(pMovie->pppInfos[infoNo][0]);
   free(pMovie->pppInfos[infoNo][1]);
 
-  for( i = infoNo; i < pMovie->infoCnt - 1; i++ )
-  {
+  for (i = infoNo; i < pMovie->infoCnt - 1; i++) {
     pppNewInfos[i][0] = pMovie->pppInfos[i + 1][0];
     pppNewInfos[i][1] = pMovie->pppInfos[i + 1][1];
   }
@@ -344,8 +350,7 @@ void BlinkenMovieDeleteInfos( stBlinkenMovie * pMovie )
   if (pppNewInfos == NULL)
     return;
 
-  for( i = 0; i < pMovie->infoCnt; i++ )
-  {
+  for (i = 0; i < pMovie->infoCnt; i++) {
     free(pMovie->pppInfos[i][0]);
     free(pMovie->pppInfos[i][1]);
   }
@@ -368,21 +373,26 @@ stBlinkenFrame * BlinkenMovieGetFrame( stBlinkenMovie * pMovie, int frameNo )
   if (pMovie == NULL || pMovie->frameCnt < 1)
     return NULL;
 
-  if( frameNo < 0 ) frameNo = 0;
-  if( frameNo >= pMovie->frameCnt ) frameNo = pMovie->frameCnt - 1;
+  if (frameNo < 0)
+    frameNo = 0;
+  if (frameNo >= pMovie->frameCnt)
+    frameNo = pMovie->frameCnt - 1;
   return pMovie->ppFrames[frameNo];
 }
 
-void BlinkenMovieSetFrame( stBlinkenMovie * pMovie, int frameNo, stBlinkenFrame * pFrame )
+void BlinkenMovieSetFrame(stBlinkenMovie * pMovie, int frameNo,
+                          stBlinkenFrame * pFrame)
 {
   if (pMovie == NULL || frameNo < 0 || frameNo >= pMovie->frameCnt)
     return;
 
-  BlinkenFrameResize( pFrame, pMovie->height, pMovie->width, pMovie->channels, pMovie->maxval );
+  BlinkenFrameResize(pFrame, pMovie->height, pMovie->width, pMovie->channels,
+                     pMovie->maxval);
   pMovie->ppFrames[frameNo] = pFrame;
 }
 
-int BlinkenMovieInsertFrame( stBlinkenMovie * pMovie, int frameNo, stBlinkenFrame * pFrame )
+int BlinkenMovieInsertFrame(stBlinkenMovie * pMovie, int frameNo,
+                            stBlinkenFrame * pFrame)
 {
   stBlinkenFrame **ppNewFrames;
   int i;
@@ -390,14 +400,17 @@ int BlinkenMovieInsertFrame( stBlinkenMovie * pMovie, int frameNo, stBlinkenFram
   if (pMovie == NULL || frameNo < 0 || frameNo > pMovie->frameCnt)
     return -1;
 
-  ppNewFrames = (stBlinkenFrame * *)malloc1D( pMovie->frameCnt + 1, sizeof( stBlinkenFrame * ) );
+  ppNewFrames =
+      (stBlinkenFrame **) malloc1D(pMovie->frameCnt + 1,
+                                   sizeof(stBlinkenFrame *));
   if (ppNewFrames == NULL)
     return -1;
 
   for (i = 0; i < frameNo; i++)
     ppNewFrames[i] = pMovie->ppFrames[i];
 
-  BlinkenFrameResize( pFrame, pMovie->height, pMovie->width, pMovie->channels, pMovie->maxval );
+  BlinkenFrameResize(pFrame, pMovie->height, pMovie->width, pMovie->channels,
+                     pMovie->maxval);
   ppNewFrames[frameNo] = pFrame;
 
   for (i = frameNo; i < pMovie->frameCnt; i++)
@@ -425,7 +438,9 @@ void BlinkenMovieDeleteFrame( stBlinkenMovie * pMovie, int frameNo )
   if (pMovie == NULL || frameNo < 0 || frameNo >= pMovie->frameCnt)
     return;
 
-  ppNewFrames = (stBlinkenFrame * *)malloc1D( pMovie->frameCnt - 1, sizeof( stBlinkenFrame * ) );
+  ppNewFrames =
+      (stBlinkenFrame **) malloc1D(pMovie->frameCnt - 1,
+                                   sizeof(stBlinkenFrame *));
   if (ppNewFrames == NULL)
     return;
 
@@ -462,7 +477,10 @@ void BlinkenMovieDeleteFrames( stBlinkenMovie * pMovie )
   pMovie->frameCnt = 0;
 }
 
-int BlinkenMovieConcat( stBlinkenMovie * pMovie, stBlinkenMovie * pMovie2 /* appended and freed */ )
+int BlinkenMovieConcat(stBlinkenMovie * pMovie, stBlinkenMovie * pMovie2        /* appended 
+                                                                                   and 
+                                                                                   freed 
+                                                                                 */ )
 {
   stBlinkenFrame **ppNewFrames, **ppNewFrames2;
   int i;
@@ -470,9 +488,12 @@ int BlinkenMovieConcat( stBlinkenMovie * pMovie, stBlinkenMovie * pMovie2 /* app
   if (pMovie == NULL || pMovie2 == NULL)
     return -1;
 
-  BlinkenMovieResize( pMovie2, pMovie->height, pMovie->width, pMovie->channels, pMovie->maxval );
+  BlinkenMovieResize(pMovie2, pMovie->height, pMovie->width, pMovie->channels,
+                     pMovie->maxval);
 
-  ppNewFrames = (stBlinkenFrame * *)malloc1D( pMovie->frameCnt + pMovie2->frameCnt, sizeof( stBlinkenFrame * ) );
+  ppNewFrames =
+      (stBlinkenFrame **) malloc1D(pMovie->frameCnt + pMovie2->frameCnt,
+                                   sizeof(stBlinkenFrame *));
   if (ppNewFrames == NULL)
     return -1;
   ppNewFrames2 = (stBlinkenFrame **) malloc1D(0, sizeof(stBlinkenFrame *));
@@ -511,21 +532,30 @@ void BlinkenMovieReverse( stBlinkenMovie * pMovie )
   }
 }
 
-void BlinkenMovieResize( stBlinkenMovie * pMovie, int height, int width, int channels, int maxval )
+void BlinkenMovieResize(stBlinkenMovie * pMovie, int height, int width,
+                        int channels, int maxval)
 {
   int i;
 
   if (pMovie == NULL)
     return;
 
-  if( height < BlinkenHeightMin ) height = BlinkenHeightMin;
-  if( height > BlinkenHeightMax ) height = BlinkenHeightMax;
-  if( width < BlinkenWidthMin ) width = BlinkenWidthMin;
-  if( width > BlinkenWidthMax ) width = BlinkenWidthMax;
-  if( channels < BlinkenChannelsMin ) channels = BlinkenChannelsMin;
-  if( channels > BlinkenChannelsMax ) channels = BlinkenMaxvalMax;
-  if( maxval < BlinkenMaxvalMin ) maxval = BlinkenMaxvalMin;
-  if( maxval > BlinkenMaxvalMax ) maxval = BlinkenMaxvalMax;
+  if (height < BlinkenHeightMin)
+    height = BlinkenHeightMin;
+  if (height > BlinkenHeightMax)
+    height = BlinkenHeightMax;
+  if (width < BlinkenWidthMin)
+    width = BlinkenWidthMin;
+  if (width > BlinkenWidthMax)
+    width = BlinkenWidthMax;
+  if (channels < BlinkenChannelsMin)
+    channels = BlinkenChannelsMin;
+  if (channels > BlinkenChannelsMax)
+    channels = BlinkenMaxvalMax;
+  if (maxval < BlinkenMaxvalMin)
+    maxval = BlinkenMaxvalMin;
+  if (maxval > BlinkenMaxvalMax)
+    maxval = BlinkenMaxvalMax;
 
   pMovie->height = height;
   pMovie->width = width;
@@ -543,10 +573,14 @@ void BlinkenMovieScale( stBlinkenMovie * pMovie, int height, int width )
   if (pMovie == NULL)
     return;
 
-  if( height < BlinkenHeightMin ) height = BlinkenHeightMin;
-  if( height > BlinkenHeightMax ) height = BlinkenHeightMax;
-  if( width < BlinkenWidthMin ) width = BlinkenWidthMin;
-  if( width > BlinkenWidthMax ) width = BlinkenWidthMax;
+  if (height < BlinkenHeightMin)
+    height = BlinkenHeightMin;
+  if (height > BlinkenHeightMax)
+    height = BlinkenHeightMax;
+  if (width < BlinkenWidthMin)
+    width = BlinkenWidthMin;
+  if (width > BlinkenWidthMax)
+    width = BlinkenWidthMax;
 
   pMovie->height = height;
   pMovie->width = width;
@@ -562,15 +596,16 @@ void BlinkenMovieColorize( stBlinkenMovie * pMovie, int channels, int mode )
   if (pMovie == NULL)
     return;
 
-  if( channels < BlinkenChannelsMin ) channels = BlinkenChannelsMin;
-  if( channels > BlinkenChannelsMax ) channels = BlinkenMaxvalMax;
+  if (channels < BlinkenChannelsMin)
+    channels = BlinkenChannelsMin;
+  if (channels > BlinkenChannelsMax)
+    channels = BlinkenMaxvalMax;
 
   pMovie->channels = channels;
   pMovie->maxval = BlinkenMaxvalMax;
 
   step = 0;
-  for( i = 0; i < pMovie->frameCnt; i++ )
-  {
+  for (i = 0; i < pMovie->frameCnt; i++) {
     BlinkenFrameColorize(pMovie->ppFrames[i], channels, mode, step);
     step += BlinkenFrameGetDuration(pMovie->ppFrames[i]);
   }
@@ -588,11 +623,9 @@ char * BlinkenMovieToString( stBlinkenMovie * pMovie )
   if (strs == NULL)
     return NULL;
 
-  for( i = 0; i < pMovie->frameCnt; i++ )
-  {
+  for (i = 0; i < pMovie->frameCnt; i++) {
     strs[i] = BlinkenFrameToString(pMovie->ppFrames[i]);
-    if( strs[i] == NULL )
-    {
+    if (strs[i] == NULL) {
       for (i--; i >= 0; i--)
         free(strs[i]);
       free(strs);
@@ -602,13 +635,13 @@ char * BlinkenMovieToString( stBlinkenMovie * pMovie )
 
   size = 128;
   for (i = 0; i < pMovie->infoCnt; i++)
-    size += strlen( pMovie->pppInfos[i][0] ) + strlen( pMovie->pppInfos[i][1] ) + 8;
+    size +=
+        strlen(pMovie->pppInfos[i][0]) + strlen(pMovie->pppInfos[i][1]) + 8;
   for (i = 0; i < pMovie->frameCnt; i++)
     size += strlen(strs[i]) + 32;
 
   str = (char *)malloc(size);
-  if( str == NULL )
-  {
+  if (str == NULL) {
     for (i = 0; i < pMovie->frameCnt; i++)
       free(strs[i]);
     free(strs);
@@ -617,17 +650,16 @@ char * BlinkenMovieToString( stBlinkenMovie * pMovie )
 
   ptr = str;
 
-  sprintf( ptr, "BlinkenMovie %ux%u-%u/%u\n", pMovie->width, pMovie->height, pMovie->channels, pMovie->maxval + 1 );
+  sprintf(ptr, "BlinkenMovie %ux%u-%u/%u\n", pMovie->width, pMovie->height,
+          pMovie->channels, pMovie->maxval + 1);
   ptr += strlen(ptr);
 
-  for( i = 0; i < pMovie->infoCnt; i++ )
-  {
+  for (i = 0; i < pMovie->infoCnt; i++) {
     sprintf(ptr, "%s = %s\n", pMovie->pppInfos[i][0], pMovie->pppInfos[i][1]);
     ptr += strlen(ptr);
   }
 
-  for( i = 0; i < pMovie->frameCnt; i++ )
-  {
+  for (i = 0; i < pMovie->frameCnt; i++) {
     sprintf(ptr, "frame %u\n%s", i, strs[i]);
     ptr += strlen(ptr);
     free(strs[i]);
@@ -654,16 +686,13 @@ stBlinkenMovie * BlinkenMovieLoadBlm( char * pFilename )
     return NULL;
 
   // read magic and size
-  if( fscanf( pFile, " # BlinkenLights Movie %ux%u", &width, &height ) != 2 )
-  {
+  if (fscanf(pFile, " # BlinkenLights Movie %ux%u", &width, &height) != 2) {
     fclose(pFile);
     return NULL;
   }
-
   // allocate a new movie
   pMovie = BlinkenMovieNew(height, width, 1, 1);
-  if( pMovie == NULL )
-  {
+  if (pMovie == NULL) {
     fclose(pFile);
     return NULL;
   }
@@ -673,42 +701,36 @@ stBlinkenMovie * BlinkenMovieLoadBlm( char * pFilename )
   y = 0;
 
   // read frames
-  while( ! feof( pFile ) )
-  {
+  while (!feof(pFile)) {
     // skip rest of previous line (including newline)
     while ((chr = fgetc(pFile)) != '\n' && chr != EOF) ;
 
     // info line
-    if( fscanf( pFile, " # %255[A-Za-z0-9] %*[=:] %1023[^\n]", infoType, infoData ) == 2 )
-    {
+    if (fscanf
+        (pFile, " # %255[A-Za-z0-9] %*[=:] %1023[^\n]", infoType,
+         infoData) == 2) {
       BlinkenMovieAppendInfo(pMovie, infoType, infoData);
     }
-
     // start of frame
-    else if( fscanf( pFile, " @ %u", &duration ) == 1 )
-    {
+    else if (fscanf(pFile, " @ %u", &duration) == 1) {
       // create new frame and append it to movie
       pFrame = BlinkenFrameNew(height, width, 1, 1, duration);
-      if( pFrame != NULL )
-      {
+      if (pFrame != NULL) {
         BlinkenFrameClear(pFrame);
-        if( BlinkenMovieAppendFrame( pMovie, pFrame ) != 0 )
-        {
+        if (BlinkenMovieAppendFrame(pMovie, pFrame) != 0) {
           BlinkenFrameFree(pFrame);
           pFrame = NULL;
         }
         y = 0;
       }
     }
-
     // data line
-    else if( fscanf( pFile, "%1[01]", pixel ) == 1 )
-    {
-      if( pFrame != NULL )
-      {
-        for( x = 0; ; x++ )
-        {
-          BlinkenFrameSetPixel( pFrame, y, x, 0, (unsigned char)(pixel[0] == '1' ? 1 : 0) ); //set pixel
+    else if (fscanf(pFile, "%1[01]", pixel) == 1) {
+      if (pFrame != NULL) {
+        for (x = 0;; x++) {
+          BlinkenFrameSetPixel(pFrame, y, x, 0, (unsigned char)(pixel[0] == '1' ? 1 : 0));      // set 
+                                                                                                // 
+          // pixel
           if (fscanf(pFile, "%1[01]", pixel) != 1)      // read next pixel
             break;
         }
@@ -741,16 +763,13 @@ stBlinkenMovie * BlinkenMovieLoadBmm( char * pFilename )
     return NULL;
 
   // read magic and size
-  if( fscanf( pFile, " # BlinkenMini Movie %ux%u", &width, &height ) != 2 )
-  {
+  if (fscanf(pFile, " # BlinkenMini Movie %ux%u", &width, &height) != 2) {
     fclose(pFile);
     return NULL;
   }
-
   // allocate a new movie
   pMovie = BlinkenMovieNew(height, width, 1, 255);
-  if( pMovie == NULL )
-  {
+  if (pMovie == NULL) {
     fclose(pFile);
     return NULL;
   }
@@ -760,46 +778,41 @@ stBlinkenMovie * BlinkenMovieLoadBmm( char * pFilename )
   y = 0;
 
   // read frames
-  while( ! feof( pFile ) )
-  {
+  while (!feof(pFile)) {
     // skip rest of previous line (including newline)
     while ((chr = fgetc(pFile)) != '\n' && chr != EOF) ;
 
     // info line
-    if( fscanf( pFile, " # %255[A-Za-z0-9] %*[=:] %1023[^\n]", infoType, infoData ) == 2 )
-    {
+    if (fscanf
+        (pFile, " # %255[A-Za-z0-9] %*[=:] %1023[^\n]", infoType,
+         infoData) == 2) {
       BlinkenMovieAppendInfo(pMovie, infoType, infoData);
     }
-
     // start of frame
-    else if( fscanf( pFile, " @ %u", &duration ) == 1 )
-    {
+    else if (fscanf(pFile, " @ %u", &duration) == 1) {
       // create new frame and append it to movie
       pFrame = BlinkenFrameNew(height, width, 1, 255, duration);
-      if( pFrame != NULL )
-      {
+      if (pFrame != NULL) {
         BlinkenFrameClear(pFrame);
-        if( BlinkenMovieAppendFrame( pMovie, pFrame ) != 0 )
-        {
+        if (BlinkenMovieAppendFrame(pMovie, pFrame) != 0) {
           BlinkenFrameFree(pFrame);
           pFrame = NULL;
         }
         y = 0;
       }
     }
-
     // data line
-    else if( fscanf( pFile, "%7[0-9A-FXa-fx]", pixel ) == 1 )
-    {
-      if( pFrame != NULL )
-      {
-        for( x = 0; ; x++ )
-        {
+    else if (fscanf(pFile, "%7[0-9A-FXa-fx]", pixel) == 1) {
+      if (pFrame != NULL) {
+        for (x = 0;; x++) {
           if (sscanf(pixel, "%i", &val) != 1)   // convert pixel to number
             break;
-          BlinkenFrameSetPixel( pFrame, y, x, 0, (unsigned char)val ); //set pixel
+          BlinkenFrameSetPixel(pFrame, y, x, 0, (unsigned char)val);    // set 
+                                                                        // 
+          // pixel
           fscanf(pFile, "%*[ \t]");     // kill space
-          if( fscanf( pFile, "%7[0-9A-FXa-fx]", pixel ) != 1 ) //read next pixel
+          if (fscanf(pFile, "%7[0-9A-FXa-fx]", pixel) != 1)     // read next
+            // pixel
             break;
         }
         y++;    // next row
@@ -820,7 +833,8 @@ stBlinkenMovie * BlinkenMovieLoadBml( char * pFilename )
   stBlinkenMovie *pMovie;
   stBlinkenFrame *pFrame;
   int width, height, channels, bits, maxval, chrs, y, x, c, duration, val;
-  char buffer[2048], infoType[256], infoData[1024], pixelFormat[16], pixel[8], * ptr, chr;
+  char buffer[2048], infoType[256], infoData[1024], pixelFormat[16], pixel[8],
+      *ptr, chr;
 
   if (pFilename == NULL)
     return NULL;
@@ -839,8 +853,7 @@ stBlinkenMovie * BlinkenMovieLoadBml( char * pFilename )
 
   // read tags
   maxval = 0;
-  while( ! feof( pFile ) )
-  {
+  while (!feof(pFile)) {
 
     // skip to just before beginning of next tag
     fscanf(pFile, "%*[^<]");
@@ -850,12 +863,10 @@ stBlinkenMovie * BlinkenMovieLoadBml( char * pFilename )
       break;
 
     // no blm tag yet
-    if( pMovie == NULL )
-    {
+    if (pMovie == NULL) {
 
       // blm tag
-      if( fscanf( pFile, "blm%2047[^>]", buffer ) == 1 )
-      {
+      if (fscanf(pFile, "blm%2047[^>]", buffer) == 1) {
         // get attributes
         width = 0;
         height = 0;
@@ -874,8 +885,7 @@ stBlinkenMovie * BlinkenMovieLoadBml( char * pFilename )
 
         // allocate a new movie
         pMovie = BlinkenMovieNew(height, width, channels, maxval);
-        if( pMovie == NULL )
-        {
+        if (pMovie == NULL) {
           fclose(pFile);
           return NULL;
         }
@@ -883,7 +892,17 @@ stBlinkenMovie * BlinkenMovieLoadBml( char * pFilename )
         // get number of characters per channel
         chrs = (bits + 3) >> 2;
         // get fscanf formart string for reading a pixel
-        sprintf( pixelFormat, "%%%d[0-9A-Fa-f]", chrs > 4 ? 5 : chrs ); //read max 5 chars (2 already in use by prefix)
+        sprintf(pixelFormat, "%%%d[0-9A-Fa-f]", chrs > 4 ? 5 : chrs);   // read 
+                                                                        // 
+        // max 
+        // 5
+        // chars 
+        // (2 
+        // already 
+        // in 
+        // use 
+        // by 
+        // prefix)
         // initialize pixel buffer with hex prefix
         strcpy(pixel, "0x");
       }
@@ -895,92 +914,72 @@ stBlinkenMovie * BlinkenMovieLoadBml( char * pFilename )
     {
 
       // title tag
-      if( fscanf( pFile, "title>%2047[^<]", buffer ) == 1 )
-      {
+      if (fscanf(pFile, "title>%2047[^<]", buffer) == 1) {
         // add info to movie
         BlinkenMovieAppendInfo(pMovie, "title", buffer);
       }
-
       // description tag
-      else if( fscanf( pFile, "description>%2047[^<]", buffer ) == 1 )
-      {
+      else if (fscanf(pFile, "description>%2047[^<]", buffer) == 1) {
         // check if generic info
-        if( sscanf( buffer, "%255[A-Za-z0-9] %*[=:] %1023[^\n]", infoType, infoData ) == 2 )
+        if (sscanf
+            (buffer, "%255[A-Za-z0-9] %*[=:] %1023[^\n]", infoType,
+             infoData) == 2)
           // add info to movie
           BlinkenMovieAppendInfo(pMovie, infoType, infoData);
         else
           // add info to movie
           BlinkenMovieAppendInfo(pMovie, "description", buffer);
       }
-
       // creator tag
-      else if( fscanf( pFile, "creator>%2047[^<]", buffer ) == 1 )
-      {
+      else if (fscanf(pFile, "creator>%2047[^<]", buffer) == 1) {
         // add info to movie
         BlinkenMovieAppendInfo(pMovie, "creator", buffer);
       }
-
       // author tag
-      else if( fscanf( pFile, "author>%2047[^<]", buffer ) == 1 )
-      {
+      else if (fscanf(pFile, "author>%2047[^<]", buffer) == 1) {
         // add info to movie
         BlinkenMovieAppendInfo(pMovie, "author", buffer);
       }
-
       // email tag
-      else if( fscanf( pFile, "email>%2047[^<]", buffer ) == 1 )
-      {
+      else if (fscanf(pFile, "email>%2047[^<]", buffer) == 1) {
         // add info to movie
         BlinkenMovieAppendInfo(pMovie, "email", buffer);
       }
-
       // url tag
-      else if( fscanf( pFile, "url>%2047[^<]", buffer ) == 1 )
-      {
+      else if (fscanf(pFile, "url>%2047[^<]", buffer) == 1) {
         // add info to movie
         BlinkenMovieAppendInfo(pMovie, "url", buffer);
       }
-
       // frame tag
-      else if( fscanf( pFile, "frame%2047[^>]", buffer ) == 1 )
-      {
+      else if (fscanf(pFile, "frame%2047[^>]", buffer) == 1) {
         // get attributes
         duration = 0;
         if ((ptr = strstr(buffer, "duration=\"")) != NULL)      // duration
           sscanf(ptr + 10, "%u", &duration);
         // create new frame and append it to movie
         pFrame = BlinkenFrameNew(height, width, channels, maxval, duration);
-        if( pFrame != NULL )
-        {
+        if (pFrame != NULL) {
           BlinkenFrameClear(pFrame);
-          if( BlinkenMovieAppendFrame( pMovie, pFrame ) != 0 )
-          {
+          if (BlinkenMovieAppendFrame(pMovie, pFrame) != 0) {
             BlinkenFrameFree(pFrame);
             pFrame = NULL;
           }
           y = 0;
         }
       }
-
       // row tag
-      else if( fscanf( pFile, "row%c", &chr ) == 1 && chr == '>' )
-      {
-        if( pFrame != NULL )
-        {
+      else if (fscanf(pFile, "row%c", &chr) == 1 && chr == '>') {
+        if (pFrame != NULL) {
           // parse row
-          for( x = 0; x < width; x++ )
-          {
-            for( c = 0; c < channels; c++ )
-            {
+          for (x = 0; x < width; x++) {
+            for (c = 0; c < channels; c++) {
               // read next pixel (one channel of pixel)
-              if( fscanf( pFile, pixelFormat, pixel+2 ) != 1 )
-              {
+              if (fscanf(pFile, pixelFormat, pixel + 2) != 1) {
                 x = width;      // also terminate x loop
                 break;
               }
               // convert pixel (one channel of pixel) to number
-              if( sscanf( pixel, "%i", &val ) != 1 )
-              {
+              if (sscanf(pixel, "%i", &val) != 1) {
                 x = width;      // also terminate x loop
                 break;
               }
@@ -1025,70 +1024,75 @@ stBlinkenMovie * BlinkenMovieLoadBbm( char * pFilename )
     return NULL;
 
   // read header
-  if( fread( header, 1, 24, pFile ) != 24 )
-  {
+  if (fread(header, 1, 24, pFile) != 24) {
     fclose(pFile);
     return NULL;
   }
-  headerMagic = (unsigned long)header[0] << 24 | (unsigned long)header[1] << 16 | (unsigned long)header[2] << 8 | (unsigned long)header[3];
+  headerMagic =
+      (unsigned long)header[0] << 24 | (unsigned long)header[1] << 16 |
+      (unsigned long)header[2] << 8 | (unsigned long)header[3];
   headerHeight = (unsigned short)header[4] << 8 | (unsigned short)header[5];
   headerWidth = (unsigned short)header[6] << 8 | (unsigned short)header[7];
   headerChannels = (unsigned short)header[8] << 8 | (unsigned short)header[9];
   headerMaxval = (unsigned short)header[10] << 8 | (unsigned short)header[11];
-  headerFrameCnt = (unsigned long)header[12] << 24 | (unsigned long)header[13] << 16 | (unsigned long)header[14] << 8 | (unsigned long)header[15];
-  headerDuration = (unsigned long)header[16] << 24 | (unsigned long)header[17] << 16 | (unsigned long)header[18] << 8 | (unsigned long)header[19];
-  headerFramePtr = (unsigned long)header[20] << 24 | (unsigned long)header[21] << 16 | (unsigned long)header[22] << 8 | (unsigned long)header[23];
+  headerFrameCnt =
+      (unsigned long)header[12] << 24 | (unsigned long)header[13] << 16 |
+      (unsigned long)header[14] << 8 | (unsigned long)header[15];
+  headerDuration =
+      (unsigned long)header[16] << 24 | (unsigned long)header[17] << 16 |
+      (unsigned long)header[18] << 8 | (unsigned long)header[19];
+  headerFramePtr =
+      (unsigned long)header[20] << 24 | (unsigned long)header[21] << 16 |
+      (unsigned long)header[22] << 8 | (unsigned long)header[23];
   // check magic
-  if( headerMagic != 0x23542666 )
-  {
+  if (headerMagic != 0x23542666) {
     fclose(pFile);
     return NULL;
   }
-
   // allocate a new movie
-  pMovie = BlinkenMovieNew( headerHeight, headerWidth, headerChannels, headerMaxval );
-  if( pMovie == NULL )
-  {
+  pMovie =
+      BlinkenMovieNew(headerHeight, headerWidth, headerChannels,
+                      headerMaxval);
+  if (pMovie == NULL) {
     fclose(pFile);
     return NULL;
   }
-
   // read subheaders
-  while( ftell( pFile ) + 6 <= (long)headerFramePtr )
-  {
-    if( fread( subHeader, 1, 6, pFile ) != 6 )
-    {
+  while (ftell(pFile) + 6 <= (long)headerFramePtr) {
+    if (fread(subHeader, 1, 6, pFile) != 6) {
       BlinkenMovieFree(pMovie);
       fclose(pFile);
       return NULL;
     }
-    subHeaderMagic = (unsigned long)subHeader[0] << 24 | (unsigned long)subHeader[1] << 16 | (unsigned long)subHeader[2] << 8 | (unsigned long)subHeader[3];
-    subHeaderSize = (unsigned short)subHeader[4] << 8 | (unsigned short)subHeader[5];
+    subHeaderMagic =
+        (unsigned long)subHeader[0] << 24 | (unsigned long)subHeader[1] << 16
+        | (unsigned long)subHeader[2] << 8 | (unsigned long)subHeader[3];
+    subHeaderSize =
+        (unsigned short)subHeader[4] << 8 | (unsigned short)subHeader[5];
 
     // header fits into gap to frame start
-    if( subHeaderSize >= 6 && ftell( pFile ) + subHeaderSize - 6 <= (long)headerFramePtr )
-    {
+    if (subHeaderSize >= 6
+        && ftell(pFile) + subHeaderSize - 6 <= (long)headerFramePtr) {
       // info header
       if (subHeaderMagic == 0x696E666F) // 'i' 'n' 'f' 'o'
       {
         // read rest of info header
         pInfoHeader = (char *)malloc(subHeaderSize - 6);
-        if( pInfoHeader == NULL )
-        {
+        if (pInfoHeader == NULL) {
           BlinkenMovieFree(pMovie);
           fclose(pFile);
           return NULL;
         }
-        if( fread( pInfoHeader, 1, subHeaderSize - 6, pFile ) != (unsigned short)(subHeaderSize - 6) )
-        {
+        if (fread(pInfoHeader, 1, subHeaderSize - 6, pFile) !=
+            (unsigned short)(subHeaderSize - 6)) {
           free(pInfoHeader);
           BlinkenMovieFree(pMovie);
           fclose(pFile);
           return NULL;
         }
         // parse information
-        if( (pInfoHeaderX = memchr( pInfoHeader, 0, subHeaderSize - 6 )) != NULL )
-        {
+        if ((pInfoHeaderX =
+             memchr(pInfoHeader, 0, subHeaderSize - 6)) != NULL) {
           pInfoHeaderX++;
           len = pInfoHeaderX - pInfoHeader;
           if (memchr(pInfoHeaderX, 0, subHeaderSize - 6 - len) != NULL)
@@ -1109,13 +1112,15 @@ stBlinkenMovie * BlinkenMovieLoadBbm( char * pFilename )
   fseek(pFile, headerFramePtr, SEEK_SET);
 
   // read frame start marker
-  if( fread( frameStartMarker, 1, 4, pFile ) != 4 )
-  {
+  if (fread(frameStartMarker, 1, 4, pFile) != 4) {
     BlinkenMovieFree(pMovie);
     fclose(pFile);
     return NULL;
   }
-  frameStartMarkerMagic = (unsigned long)frameStartMarker[0] << 24 | (unsigned long)frameStartMarker[1] << 16 | (unsigned long)frameStartMarker[2] << 8 | (unsigned long)frameStartMarker[3];
+  frameStartMarkerMagic =
+      (unsigned long)frameStartMarker[0] << 24 | (unsigned long)
+      frameStartMarker[1] << 16 | (unsigned long)frameStartMarker[2] << 8 |
+      (unsigned long)frameStartMarker[3];
   if (frameStartMarkerMagic != 0x66726D73)      // 'f' 'r' 'm' 's'
   {
     BlinkenMovieFree(pMovie);
@@ -1126,22 +1130,22 @@ stBlinkenMovie * BlinkenMovieLoadBbm( char * pFilename )
   // allocate buffer for frame data
   len = 2 + headerHeight * headerWidth * headerChannels;
   pFrameData = (unsigned char *)malloc(len);
-  if( pFrameData == NULL )
-  {
+  if (pFrameData == NULL) {
     BlinkenMovieFree(pMovie);
     fclose(pFile);
     return NULL;
   }
-
   // read frames
-  for( ; ; )
-  {
+  for (;;) {
     // read frame
     if (fread(pFrameData, 1, len, pFile) != (unsigned int)len)
       break;
-    duration = (unsigned short)pFrameData[0] << 8 | (unsigned short)pFrameData[1];
+    duration =
+        (unsigned short)pFrameData[0] << 8 | (unsigned short)pFrameData[1];
     // build frame and append it to movie
-    pFrame = BlinkenFrameNew( headerHeight, headerWidth, headerChannels, headerMaxval, duration );
+    pFrame =
+        BlinkenFrameNew(headerHeight, headerWidth, headerChannels,
+                        headerMaxval, duration);
     if (pFrame == NULL)
       break;
     i = 2;
@@ -1149,8 +1153,7 @@ stBlinkenMovie * BlinkenMovieLoadBbm( char * pFilename )
       for (x = 0; x < headerWidth; x++)
         for (c = 0; c < headerChannels; c++, i++)
           BlinkenFrameSetPixel(pFrame, y, x, c, pFrameData[i]);
-    if( BlinkenMovieAppendFrame( pMovie, pFrame ) != 0 )
-    {
+    if (BlinkenMovieAppendFrame(pMovie, pFrame) != 0) {
       BlinkenFrameFree(pFrame);
       pFrame = NULL;
     }
@@ -1215,27 +1218,25 @@ int BlinkenMovieSaveBlm( stBlinkenMovie * pMovie, char * pFilename )
 
   // open file
   pFile = fopen(pFilename, "wt");
-  if( pFile == NULL )
-  {
+  if (pFile == NULL) {
     BlinkenMovieFree(pOutMovie);
     return -1;
   }
-
   // write header line
-  fprintf( pFile, "# BlinkenLights Movie %ux%u\n", pOutMovie->width, pOutMovie->height );
+  fprintf(pFile, "# BlinkenLights Movie %ux%u\n", pOutMovie->width,
+          pOutMovie->height);
 
   // write information lines
   for (i = 0; i < pOutMovie->infoCnt; i++)
-    fprintf( pFile, "# %s = %s\n", pOutMovie->pppInfos[i][0], pOutMovie->pppInfos[i][1] );
+    fprintf(pFile, "# %s = %s\n", pOutMovie->pppInfos[i][0],
+            pOutMovie->pppInfos[i][1]);
 
   // write frames
-  for( i = 0; i < pOutMovie->frameCnt; i++ )
-  {
-    fprintf( pFile, "\n@%u\n", BlinkenFrameGetDuration( pOutMovie->ppFrames[i] ) );
-    for( y = 0; y < pOutMovie->height; y++ )
-    {
-      for( x = 0; x < pOutMovie->width; x++ )
-      {
+  for (i = 0; i < pOutMovie->frameCnt; i++) {
+    fprintf(pFile, "\n@%u\n",
+            BlinkenFrameGetDuration(pOutMovie->ppFrames[i]));
+    for (y = 0; y < pOutMovie->height; y++) {
+      for (x = 0; x < pOutMovie->width; x++) {
         if (BlinkenFrameGetPixel(pOutMovie->ppFrames[i], y, x, 0) != 0)
           fprintf(pFile, "1");
         else
@@ -1272,28 +1273,29 @@ int BlinkenMovieSaveBmm( stBlinkenMovie * pMovie, char * pFilename )
 
   // open file
   pFile = fopen(pFilename, "wt");
-  if( pFile == NULL )
-  {
+  if (pFile == NULL) {
     BlinkenMovieFree(pOutMovie);
     return -1;
   }
-
   // write header line
-  fprintf( pFile, "# BlinkenMini Movie %ux%u\n", pOutMovie->width, pOutMovie->height );
+  fprintf(pFile, "# BlinkenMini Movie %ux%u\n", pOutMovie->width,
+          pOutMovie->height);
 
   // write information lines
   for (i = 0; i < pOutMovie->infoCnt; i++)
-    fprintf( pFile, "# %s = %s\n", pOutMovie->pppInfos[i][0], pOutMovie->pppInfos[i][1] );
+    fprintf(pFile, "# %s = %s\n", pOutMovie->pppInfos[i][0],
+            pOutMovie->pppInfos[i][1]);
 
   // write frames
-  for( i = 0; i < pOutMovie->frameCnt; i++ )
-  {
-    fprintf( pFile, "\n@%u\n", BlinkenFrameGetDuration( pOutMovie->ppFrames[i] ) );
-    for( y = 0; y < pOutMovie->height; y++ )
-    {
-      fprintf( pFile, "0x%02X", BlinkenFrameGetPixel( pOutMovie->ppFrames[i], y, 0, 0 ) );
+  for (i = 0; i < pOutMovie->frameCnt; i++) {
+    fprintf(pFile, "\n@%u\n",
+            BlinkenFrameGetDuration(pOutMovie->ppFrames[i]));
+    for (y = 0; y < pOutMovie->height; y++) {
+      fprintf(pFile, "0x%02X",
+              BlinkenFrameGetPixel(pOutMovie->ppFrames[i], y, 0, 0));
       for (x = 1; x < pOutMovie->width; x++)
-        fprintf( pFile, " 0x%02X", BlinkenFrameGetPixel( pOutMovie->ppFrames[i], y, x, 0 ) );
+        fprintf(pFile, " 0x%02X",
+                BlinkenFrameGetPixel(pOutMovie->ppFrames[i], y, x, 0));
       fprintf(pFile, "\n");
     }
   }
@@ -1323,12 +1325,12 @@ int BlinkenMovieSaveBml( stBlinkenMovie * pMovie, char * pFilename )
     return -1;
   val = pOutMovie->maxval;      // get number of bits
   for (bits = 0; val != 0; val >>= 1, bits++) ;
-  BlinkenMovieResize( pOutMovie, pOutMovie->height, pOutMovie->width, pOutMovie->channels, (1 << bits) - 1 );
+  BlinkenMovieResize(pOutMovie, pOutMovie->height, pOutMovie->width,
+                     pOutMovie->channels, (1 << bits) - 1);
 
   // open file
   pFile = fopen(pFilename, "wt");
-  if( pFile == NULL )
-  {
+  if (pFile == NULL) {
     BlinkenMovieFree(pOutMovie);
     return -1;
   }
@@ -1337,19 +1338,21 @@ int BlinkenMovieSaveBml( stBlinkenMovie * pMovie, char * pFilename )
   fprintf(pFile, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 
   // write blm start tag
-  fprintf( pFile, "<blm width=\"%u\" height=\"%u\" bits=\"%u\" channels=\"%u\">\n",
+  fprintf(pFile,
+          "<blm width=\"%u\" height=\"%u\" bits=\"%u\" channels=\"%u\">\n",
           pOutMovie->width, pOutMovie->height, bits, pOutMovie->channels);
 
   // write information lines
   fprintf(pFile, "\t<header>\n");
-  for( i = 0; i < pOutMovie->infoCnt; i++ )
-  {
+  for (i = 0; i < pOutMovie->infoCnt; i++) {
     if (strcmp(pOutMovie->pppInfos[i][0], "title") == 0)
       fprintf(pFile, "\t\t<title>%s</title>\n", pOutMovie->pppInfos[i][1]);
     else if (strcmp(pOutMovie->pppInfos[i][0], "description") == 0)
-      fprintf( pFile, "\t\t<description>%s</description>\n", pOutMovie->pppInfos[i][1] );
+      fprintf(pFile, "\t\t<description>%s</description>\n",
+              pOutMovie->pppInfos[i][1]);
     else if (strcmp(pOutMovie->pppInfos[i][0], "creator") == 0)
-      fprintf( pFile, "\t\t<creator>%s</creator>\n", pOutMovie->pppInfos[i][1] );
+      fprintf(pFile, "\t\t<creator>%s</creator>\n",
+              pOutMovie->pppInfos[i][1]);
     else if (strcmp(pOutMovie->pppInfos[i][0], "author") == 0)
       fprintf(pFile, "\t\t<author>%s</author>\n", pOutMovie->pppInfos[i][1]);
     else if (strcmp(pOutMovie->pppInfos[i][0], "email") == 0)
@@ -1357,16 +1360,16 @@ int BlinkenMovieSaveBml( stBlinkenMovie * pMovie, char * pFilename )
     else if (strcmp(pOutMovie->pppInfos[i][0], "url") == 0)
       fprintf(pFile, "\t\t<url>%s</url>\n", pOutMovie->pppInfos[i][1]);
     else
-      fprintf( pFile, "\t\t<description>%s: %s</description>\n", pOutMovie->pppInfos[i][0], pOutMovie->pppInfos[i][1] );
+      fprintf(pFile, "\t\t<description>%s: %s</description>\n",
+              pOutMovie->pppInfos[i][0], pOutMovie->pppInfos[i][1]);
   }
   fprintf(pFile, "\t</header>\n");
 
   // write frames
-  for( i = 0; i < pOutMovie->frameCnt; i++ )
-  {
-    fprintf( pFile, "\n\t<frame duration=\"%u\">\n", BlinkenFrameGetDuration( pOutMovie->ppFrames[i] ) );
-    for( y = 0; y < pOutMovie->height; y++ )
-    {
+  for (i = 0; i < pOutMovie->frameCnt; i++) {
+    fprintf(pFile, "\n\t<frame duration=\"%u\">\n",
+            BlinkenFrameGetDuration(pOutMovie->ppFrames[i]));
+    for (y = 0; y < pOutMovie->height; y++) {
       fprintf(pFile, "\t\t<row>");
       for (x = 0; x < pOutMovie->width; x++)
         for (c = 0; c < pOutMovie->channels; c++)
@@ -1394,7 +1397,8 @@ int BlinkenMovieSaveBbm( stBlinkenMovie * pMovie, char * pFilename )
 {
   unsigned char *pFrameData;
   FILE *pFile;
-  unsigned char header[24], infoHeader[6], framePointer[4], frameStartMarker[4];
+  unsigned char header[24], infoHeader[6], framePointer[4],
+      frameStartMarker[4];
   int duration, len, len0, len1, i, j, y, x, c, val;
   long pos;
 
@@ -1402,14 +1406,16 @@ int BlinkenMovieSaveBbm( stBlinkenMovie * pMovie, char * pFilename )
     return -1;
 
   // allocate frame data buffer
-  pFrameData = (unsigned char *)malloc( 2 + pMovie->height * pMovie->width * pMovie->channels );
+  pFrameData =
+      (unsigned char *)malloc(2 +
+                              pMovie->height * pMovie->width *
+                              pMovie->channels);
   if (pFrameData == NULL)
     return -1;
 
   // open file
   pFile = fopen(pFilename, "wb");
-  if( pFile == NULL )
-  {
+  if (pFile == NULL) {
     free(pFrameData);
     return -1;
   }
@@ -1445,8 +1450,7 @@ int BlinkenMovieSaveBbm( stBlinkenMovie * pMovie, char * pFilename )
   fwrite(header, 1, 24, pFile);
 
   // write information
-  for( i = 0; i < pMovie->infoCnt; i++ )
-  {
+  for (i = 0; i < pMovie->infoCnt; i++) {
     len0 = strlen(pMovie->pppInfos[i][0]);
     if (len0 > 32760)
       len0 = 32760;
@@ -1485,8 +1489,7 @@ int BlinkenMovieSaveBbm( stBlinkenMovie * pMovie, char * pFilename )
   fwrite(frameStartMarker, 1, 4, pFile);
 
   // write frames
-  for( i = 0; i < pMovie->frameCnt; i++ )
-  {
+  for (i = 0; i < pMovie->frameCnt; i++) {
     val = BlinkenFrameGetDuration(pMovie->ppFrames[i]);
     pFrameData[0] = (unsigned char)(val >> 8);
     pFrameData[1] = (unsigned char)val;
@@ -1539,16 +1542,19 @@ int BlinkenMovieSave( stBlinkenMovie * pMovie, char * pFilename )
   return -1;
 }
 
-void BlinkenMovieSend( stBlinkenMovie * pMovie, SOCKET udpSocket, etBlinkenProto proto, int maxidle )
+void BlinkenMovieSend(stBlinkenMovie * pMovie, SOCKET udpSocket,
+                      etBlinkenProto proto, int maxidle)
 // udp socket must be "connected"
-//maxidle is the maximum idle time between two frames in ms (last frame is repeated after this time), use 0 to turn off this feature
+// maxidle is the maximum idle time between two frames in ms (last frame is
+// repeated after this time), use 0 to turn off this feature
 {
   int i, len, duration, dur;
   char buffer[65536];   // 64kB is more than maximum UDP size
 
-  for( i = 0; i < pMovie->frameCnt; i++ )
-  {
-    len = BlinkenFrameToNetwork( pMovie->ppFrames[i], proto, buffer, sizeof( buffer ) );
+  for (i = 0; i < pMovie->frameCnt; i++) {
+    len =
+        BlinkenFrameToNetwork(pMovie->ppFrames[i], proto, buffer,
+                              sizeof(buffer));
     duration = BlinkenFrameGetDuration(pMovie->ppFrames[i]);
     if (len > 0) {
       while (duration > 0) {
@@ -1561,7 +1567,8 @@ void BlinkenMovieSend( stBlinkenMovie * pMovie, SOCKET udpSocket, etBlinkenProto
   }
 }
 
-stBlinkenMovie * BlinkenMovieReceive( SOCKET udpSocket, int timeout, etBlinkenProto * pProto )
+stBlinkenMovie *BlinkenMovieReceive(SOCKET udpSocket, int timeout,
+                                    etBlinkenProto * pProto)
 // udp socket must be "bound" and should be "connected"
 // after timeout ms of no reception, the movie is considered to be complete
 // returns protocol in *pProto if pProto not NULL
@@ -1584,14 +1591,16 @@ stBlinkenMovie * BlinkenMovieReceive( SOCKET udpSocket, int timeout, etBlinkenPr
   proto = BlinkenProtoNone;
   pLastFrame = NULL;
   lastTime = get_ms();
-  for( ; ; )
-  {
+  for (;;) {
     // wait for next frame
     FD_ZERO(&readFds);
     FD_SET(udpSocket, &readFds);
     timeo.tv_sec = timeout / 1000;
     timeo.tv_usec = (timeout % 1000) * 1000;
-    if( select( udpSocket + 1, &readFds, NULL, NULL, &timeo ) <= 0 ) //timeout or error
+    if (select(udpSocket + 1, &readFds, NULL, NULL, &timeo) <= 0)       // timeout 
+                                                                        // 
+      // or 
+      // error
       break;
 
     // fetch data
@@ -1601,43 +1610,36 @@ stBlinkenMovie * BlinkenMovieReceive( SOCKET udpSocket, int timeout, etBlinkenPr
 
     // get frame from data
     pFrame = BlinkenFrameFromNetwork(buffer, len, &p);
-    if( pFrame != NULL )
-    {
+    if (pFrame != NULL) {
       // valid protocol
-      if( p != BlinkenProtoNone )
-      {
+      if (p != BlinkenProtoNone) {
         // first frame
         if (proto == BlinkenProtoNone)
           proto = p;    // use this protocol
         // protocol matches
-        if( p == proto )
-        {
+        if (p == proto) {
           // no movie yet
-          if( pMovie == NULL )
-          {
+          if (pMovie == NULL) {
             // allocate a new movie
             pMovie = BlinkenMovieNew(BlinkenFrameGetHeight(pFrame),
                                      BlinkenFrameGetWidth(pFrame),
                                      BlinkenFrameGetChannels(pFrame),
                                      BlinkenFrameGetMaxval(pFrame));
-            if( pMovie == NULL )
-            {
+            if (pMovie == NULL) {
               BlinkenFrameFree(pFrame);
               break;
             }
           }
-
           // ignore frame if it is equal to last one
           if (pMovie->frameCnt > 0) {
-            if( BlinkenFrameCompare( pFrame, pMovie->ppFrames[pMovie->frameCnt - 1] ) == 0 ) {
+            if (BlinkenFrameCompare
+                (pFrame, pMovie->ppFrames[pMovie->frameCnt - 1]) == 0) {
               BlinkenFrameFree(pFrame);
               continue;
             }
           }
-
           // append frame to movie
-          if( BlinkenMovieAppendFrame( pMovie, pFrame ) == 0 )
-          {
+          if (BlinkenMovieAppendFrame(pMovie, pFrame) == 0) {
             // get current time
             curTime = get_ms();
             // set duration of last frame

BlinkenLib/BlinkenMovie.h

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #ifndef INC_BlinkenLib_BlinkenMovie
 #define INC_BlinkenLib_BlinkenMovie
@@ -19,7 +17,8 @@
 
 typedef struct sBlinkenMovie stBlinkenMovie;
 
-stBlinkenMovie * BlinkenMovieNew( int height, int width, int channels, int maxval );
+stBlinkenMovie *BlinkenMovieNew(int height, int width, int channels,
+                                int maxval);
 
 stBlinkenMovie *BlinkenMovieClone(stBlinkenMovie * pSrcMovie);
 
@@ -34,24 +33,33 @@ int BlinkenMovieGetDuration( stBlinkenMovie * pMovie );
 int BlinkenMovieGetInfoCnt(stBlinkenMovie * pMovie);
 char *BlinkenMovieGetInfoType(stBlinkenMovie * pMovie, int infoNo);
 char *BlinkenMovieGetInfoData(stBlinkenMovie * pMovie, int infoNo);
-void BlinkenMovieSetInfo( stBlinkenMovie * pMovie, int infoNo, char * pInfoType, char * pInfoData );
-void BlinkenMovieInsertInfo( stBlinkenMovie * pMovie, int infoNo, char * pInfoType, char * pInfoData );
-void BlinkenMovieAppendInfo( stBlinkenMovie * pMovie, char * pInfoType, char * pInfoData );
+void BlinkenMovieSetInfo(stBlinkenMovie * pMovie, int infoNo, char *pInfoType,
+                         char *pInfoData);
+void BlinkenMovieInsertInfo(stBlinkenMovie * pMovie, int infoNo,
+                            char *pInfoType, char *pInfoData);
+void BlinkenMovieAppendInfo(stBlinkenMovie * pMovie, char *pInfoType,
+                            char *pInfoData);
 void BlinkenMovieDeleteInfo(stBlinkenMovie * pMovie, int infoNo);
 void BlinkenMovieDeleteInfos(stBlinkenMovie * pMovie);
 
 int BlinkenMovieGetFrameCnt(stBlinkenMovie * pMovie);
 stBlinkenFrame *BlinkenMovieGetFrame(stBlinkenMovie * pMovie, int frameNo);
-void BlinkenMovieSetFrame( stBlinkenMovie * pMovie, int frameNo, stBlinkenFrame * pFrame );
-int BlinkenMovieInsertFrame( stBlinkenMovie * pMovie, int frameNo, stBlinkenFrame * pFrame );
+void BlinkenMovieSetFrame(stBlinkenMovie * pMovie, int frameNo,
+                          stBlinkenFrame * pFrame);
+int BlinkenMovieInsertFrame(stBlinkenMovie * pMovie, int frameNo,
+                            stBlinkenFrame * pFrame);
 int BlinkenMovieAppendFrame(stBlinkenMovie * pMovie, stBlinkenFrame * pFrame);
 void BlinkenMovieDeleteFrame(stBlinkenMovie * pMovie, int frameNo);
 void BlinkenMovieDeleteFrames(stBlinkenMovie * pMovie);
 
-int BlinkenMovieConcat( stBlinkenMovie * pMovie, stBlinkenMovie * pMovie2 /* appended and freed */ );
+int BlinkenMovieConcat(stBlinkenMovie * pMovie, stBlinkenMovie * pMovie2        /* appended 
+                                                                                   and 
+                                                                                   freed 
+                                                                                 */ );
 void BlinkenMovieReverse(stBlinkenMovie * pMovie);
 
-void BlinkenMovieResize( stBlinkenMovie * pMovie, int height, int width, int channels, int maxval );
+void BlinkenMovieResize(stBlinkenMovie * pMovie, int height, int width,
+                        int channels, int maxval);
 void BlinkenMovieScale(stBlinkenMovie * pMovie, int height, int width);
 void BlinkenMovieColorize(stBlinkenMovie * pMovie, int channels, int mode);
 
@@ -75,11 +83,14 @@ int BlinkenMovieSaveMng( stBlinkenMovie * pMovie, char * pFilename );
 #endif // #ifdef BLINKENLIB_CFG_MNG
 int BlinkenMovieSave(stBlinkenMovie * pMovie, char *pFilename);
 
-void BlinkenMovieSend( stBlinkenMovie * pMovie, SOCKET udpSocket, etBlinkenProto proto, int maxidle );
+void BlinkenMovieSend(stBlinkenMovie * pMovie, SOCKET udpSocket,
+                      etBlinkenProto proto, int maxidle);
 // udp socket must be "connected"
-//maxidle is the maximum idle time between two frames in ms (last frame is repeated after this time), use 0 to turn off this feature
+// maxidle is the maximum idle time between two frames in ms (last frame is
+// repeated after this time), use 0 to turn off this feature
 
-stBlinkenMovie * BlinkenMovieReceive( SOCKET udpSocket, int timeout, etBlinkenProto * pProto );
+stBlinkenMovie *BlinkenMovieReceive(SOCKET udpSocket, int timeout,
+                                    etBlinkenProto * pProto);
 // udp socket must be "bound" and should be "connected"
 // after timeout ms of no reception, the movie is considered to be complete
 // returns protocol in *pProto if pProto not NULL

BlinkenLib/BlinkenOutput.c

View file @ 142b777

@@ -1,10 +1,7 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- *
- * OS X support by Manfred Wuits <manfred@werkzeugH.at>
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project OS X support by Manfred Wuits
+   <manfred@werkzeugH.at> */
 
 #include <errno.h>
 #include <fcntl.h>
@@ -34,48 +31,63 @@ static int serial_settings_parse( char * str, int * settings, int * speed )
     return 0;
 
   // baud rate
-  if( baud == 300 ) sp = B300;
-  else if( baud == 600 ) sp = B600;
-  else if( baud == 1200 ) sp = B1200;
-  else if( baud == 2400 ) sp = B2400;
-  else if( baud == 4800 ) sp = B4800;
-  else if( baud == 9600 ) sp = B9600;
-  else if( baud == 19200 ) sp = B19200;
-  else if( baud == 38400 ) sp = B38400;
-  else if( baud == 57600 ) sp = B57600;
-  else if( baud == 115200 ) sp = B115200;
-  else
-  {
+  if (baud == 300)
+    sp = B300;
+  else if (baud == 600)
+    sp = B600;
+  else if (baud == 1200)
+    sp = B1200;
+  else if (baud == 2400)
+    sp = B2400;
+  else if (baud == 4800)
+    sp = B4800;
+  else if (baud == 9600)
+    sp = B9600;
+  else if (baud == 19200)
+    sp = B19200;
+  else if (baud == 38400)
+    sp = B38400;
+  else if (baud == 57600)
+    sp = B57600;
+  else if (baud == 115200)
+    sp = B115200;
+  else {
     printf("illegal baudrate: %d\n", baud);
     return 0;
   }
 
   // parity
-  if( parity == 'n' || parity == 'N' ) set |= 0;
-  else if( parity == 'e' || parity == 'E' ) set |= PARENB;
-  else if( parity == 'o' || parity == 'O' ) set |= PARENB | PARODD;
-  else
-  {
+  if (parity == 'n' || parity == 'N')
+    set |= 0;
+  else if (parity == 'e' || parity == 'E')
+    set |= PARENB;
+  else if (parity == 'o' || parity == 'O')
+    set |= PARENB | PARODD;
+  else {
     printf("invalid parity: %c\n", parity);
     return 0;
   }
 
   // data bits
-  if( data == 5 ) set |= CS5;
-  else if( data == 6 ) set |= CS6;
-  else if( data == 7 ) set |= CS7;
-  else if( data == 8 ) set |= CS8;
-  else
-  {
+  if (data == 5)
+    set |= CS5;
+  else if (data == 6)
+    set |= CS6;
+  else if (data == 7)
+    set |= CS7;
+  else if (data == 8)
+    set |= CS8;
+  else {
     printf("illegal number of data bits: %d\n", data);
     return 0;
   }
 
   // stop bits
-  if( stop == 1 ) set |= 0;
-  else if( stop == 2 ) set |= CSTOPB;
-  else
-  {
+  if (stop == 1)
+    set |= 0;
+  else if (stop == 2)
+    set |= CSTOPB;
+  else {
     printf("illegal number of stop bits: %d\n", stop);
     return 0;
   }
@@ -87,40 +99,62 @@ static int serial_settings_parse( char * str, int * settings, int * speed )
 }
 
 // convert serial settings to text
-static void serial_settings_to_str( int settings, char * buf, unsigned int maxlen )
+static void serial_settings_to_str(int settings, char *buf,
+                                   unsigned int maxlen)
 {
   int baud, data, stop;
   char parity;
 
   // baud rate
-  if( settings & B300 ) baud = 300;
-  else if( settings & B600 ) baud = 600;
-  else if( settings & B1200 ) baud = 1200;
-  else if( settings & B2400 ) baud = 2400;
-  else if( settings & B4800 ) baud = 4800;
-  else if( settings & B9600 ) baud = 9600;
-  else if( settings & B19200 ) baud = 19200;
-  else if( settings & B38400 ) baud = 38400;
-  else if( settings & B57600 ) baud = 57600;
-  else if( settings & B115200 ) baud = 115200;
-  else baud = 0;
+  if (settings & B300)
+    baud = 300;
+  else if (settings & B600)
+    baud = 600;
+  else if (settings & B1200)
+    baud = 1200;
+  else if (settings & B2400)
+    baud = 2400;
+  else if (settings & B4800)
+    baud = 4800;
+  else if (settings & B9600)
+    baud = 9600;
+  else if (settings & B19200)
+    baud = 19200;
+  else if (settings & B38400)
+    baud = 38400;
+  else if (settings & B57600)
+    baud = 57600;
+  else if (settings & B115200)
+    baud = 115200;
+  else
+    baud = 0;
 
   // parity
   if (settings & PARENB)
-    if( settings & PARODD) parity = 'O';
-    else parity = 'E';
-  else parity = 'N';
+    if (settings & PARODD)
+      parity = 'O';
+    else
+      parity = 'E';
+  else
+    parity = 'N';
 
   // data bits
-  if( settings & CS5) data = 5;
-  else if( settings & CS6) data = 6;
-  else if( settings & CS7) data = 7;
-  else if( settings & CS8) data = 8;
-  else data = 0;
+  if (settings & CS5)
+    data = 5;
+  else if (settings & CS6)
+    data = 6;
+  else if (settings & CS7)
+    data = 7;
+  else if (settings & CS8)
+    data = 8;
+  else
+    data = 0;
 
   // stop bits
-  if( settings & CSTOPB ) stop = 2;
-  else stop = 1;
+  if (settings & CSTOPB)
+    stop = 2;
+  else
+    stop = 1;
 
   snprintf(buf, maxlen, "%d,%c,%d,%d", baud, parity, data, stop);
 }
@@ -140,8 +174,7 @@ static int serial_settings_set( int fd, int settings, int speed )
   tio.c_cc[VMIN] = 0;   // return on single char read
 
 #ifdef BLINKENLIB_CFG_OSX
-  if( cfsetspeed( &tio, speed ) == - 1 )
-  {
+  if (cfsetspeed(&tio, speed) == -1) {
     printf("cfsetspeed: error: %s\n", strerror(errno));
     return 0;
   }
@@ -149,8 +182,7 @@ static int serial_settings_set( int fd, int settings, int speed )
   tio.c_cflag |= speed;
 #endif // #ifdef BLINKENLIB_CFG_OSX
 
-  if( tcsetattr( fd, TCSANOW, &tio ) == -1 )
-  {
+  if (tcsetattr(fd, TCSANOW, &tio) == -1) {
     printf("tcsetattr: error: %s\n", strerror(errno));
     return 0;
   }
@@ -166,8 +197,8 @@ static int recv_and_out( SOCKET udpSocket, int dev_fd,
                         int *p_device_output_active,
                         unsigned int format_change,
                         unsigned int format_height, unsigned int format_width,
-                         unsigned int format_channels, unsigned int format_colors,
-                         etBlinkenProto proto,
+                        unsigned int format_channels,
+                        unsigned int format_colors, etBlinkenProto proto,
                         int use_msecs, unsigned int msecs)
 {
   fd_set readFds, errFds;
@@ -177,8 +208,7 @@ static int recv_and_out( SOCKET udpSocket, int dev_fd,
   struct timeval start, timeout, *p_timeout, end;
 
   dev_eof = 0;
-  for( ; ; )
-  {
+  for (;;) {
     // wait for next frame
     FD_ZERO(&readFds);
     FD_SET(udpSocket, &readFds);
@@ -199,35 +229,28 @@ static int recv_and_out( SOCKET udpSocket, int dev_fd,
       timeout.tv_sec = msecs / 1000;
       timeout.tv_usec = msecs % 1000 * 1000;
       p_timeout = &timeout;
-    }
-    else
+    } else
       p_timeout = NULL;
     if (select(maxFd + 1, &readFds, NULL, &errFds, p_timeout) < 0)      // error
     {
       printf("error during select: %s\n", strerror(errno));
       return -1;
     }
-
     // error on socket or device
-    if( FD_ISSET( udpSocket, &errFds ) )
-    {
+    if (FD_ISSET(udpSocket, &errFds)) {
       printf("error on socket\n");
       return -1;
     }
-    if( dev_fd != -1 && FD_ISSET( dev_fd, &errFds ) )
-    {
+    if (dev_fd != -1 && FD_ISSET(dev_fd, &errFds)) {
       if (*p_device_output_active)
         printf("error on device\n");
       break;
     }
-
     // received frame
-    if( FD_ISSET( udpSocket, &readFds ) )
-    {
+    if (FD_ISSET(udpSocket, &readFds)) {
       // fetch data
       len = recv(udpSocket, buffer, sizeof(buffer), 0);
-      if( len < 0 )
-      {
+      if (len < 0) {
         printf("could not read from socket\n");
         return -1;
       }
@@ -236,11 +259,11 @@ static int recv_and_out( SOCKET udpSocket, int dev_fd,
 
       // get frame from data
       pFrame = BlinkenFrameFromNetwork(buffer, len, NULL);
-      if( pFrame != NULL )
-      {
+      if (pFrame != NULL) {
         // change format
         if (format_change)
-          BlinkenFrameResize( pFrame, format_height, format_width, format_channels, format_colors - 1 );
+          BlinkenFrameResize(pFrame, format_height, format_width,
+                             format_channels, format_colors - 1);
 
         // create output data from frame
         len = BlinkenFrameToNetwork(pFrame, proto, buffer, sizeof(buffer));
@@ -249,10 +272,8 @@ static int recv_and_out( SOCKET udpSocket, int dev_fd,
         BlinkenFrameFree(pFrame);
 
         // output data to device
-        if( dev_fd != -1 && len > 0 )
-        {
-          if( write( dev_fd, buffer, len ) != len )
-          {
+        if (dev_fd != -1 && len > 0) {
+          if (write(dev_fd, buffer, len) != len) {
             if (*p_device_output_active)
               printf("error writing to device\n");
             break;
@@ -264,14 +285,11 @@ static int recv_and_out( SOCKET udpSocket, int dev_fd,
         }
       }
     }
-
     // received data from device
-    if( dev_fd != -1 && FD_ISSET( dev_fd, &readFds ) )
-    {
+    if (dev_fd != -1 && FD_ISSET(dev_fd, &readFds)) {
       // read data
       len = read(dev_fd, buffer, sizeof(buffer));
-      if( len < 0 )
-      {
+      if (len < 0) {
         if (*p_device_output_active)
           printf("error reading from device\n");
         break;
@@ -279,18 +297,15 @@ static int recv_and_out( SOCKET udpSocket, int dev_fd,
       if (len == 0)
         dev_eof = 1;
     }
-
     // using time limit
-    if( use_msecs )
-    {
+    if (use_msecs) {
       // get time elapsed
       int sec, usec;
       unsigned int msec;
       gettimeofday(&end, NULL);
       sec = end.tv_sec - start.tv_sec;
       usec = end.tv_usec - start.tv_usec;
-      if( usec < 0 )
-      {
+      if (usec < 0) {
         usec += 1000000;
         sec--;
       }
@@ -314,31 +329,27 @@ static int recv_and_out( SOCKET udpSocket, int dev_fd,
 // returns error code (not for device-errors, 0 for success)
 static int open_and_output(SOCKET udpSocket, char *device,
                            int *p_device_output_active,
-                            int serial_settings_change, int serial_settings, int serial_speed,
-                            unsigned int format_change,
-                            unsigned int format_height, unsigned int format_width,
-                            unsigned int format_channels, unsigned int format_colors,
-                            etBlinkenProto proto )
+                           int serial_settings_change, int serial_settings,
+                           int serial_speed, unsigned int format_change,
+                           unsigned int format_height,
+                           unsigned int format_width,
+                           unsigned int format_channels,
+                           unsigned int format_colors, etBlinkenProto proto)
 {
   int dev_fd, err;
   char txt[64];
 
   // open device
   dev_fd = open(device, O_RDWR | O_NOCTTY | O_NONBLOCK);
-  if( dev_fd == -1 )
-  {
+  if (dev_fd == -1) {
     if (*p_device_output_active)
       printf("could not open \"%s\": error: %s\n", device, strerror(errno));
     return 0;
   }
-
   // setup serial port
-  if( serial_settings_change )
-  {
-    if( ! serial_settings_set( dev_fd, serial_settings, serial_speed ) )
-    {
-      if( *p_device_output_active )
-      {
+  if (serial_settings_change) {
+    if (!serial_settings_set(dev_fd, serial_settings, serial_speed)) {
+      if (*p_device_output_active) {
         serial_settings_to_str(serial_settings, txt, sizeof(txt));
         printf("could not set serial port to \"%s\"\n", txt);
       }
@@ -346,11 +357,10 @@ static int open_and_output( SOCKET udpSocket, char * device,
       return 0;
     }
   }
-
   // receive frames and output to device
   err = recv_and_out(udpSocket, dev_fd, p_device_output_active,
-                      format_change, format_height, format_width, format_channels, format_colors,
-                      proto, 0, 0 );
+                     format_change, format_height, format_width,
+                     format_channels, format_colors, proto, 0, 0);
 
   // close device
   close(dev_fd);
@@ -361,11 +371,15 @@ static int open_and_output( SOCKET udpSocket, char * device,
 // open device and output frames in a loop
 // returns error code (not for device-errors, 0 for success)
 static int open_and_output_loop(SOCKET udpSocket, char *device,
-                                 int serial_settings_change, int serial_settings, int serial_speed,
-                                 int reopen_device, unsigned int reopen_device_ms,
+                                int serial_settings_change,
+                                int serial_settings, int serial_speed,
+                                int reopen_device,
+                                unsigned int reopen_device_ms,
                                 unsigned int format_change,
-                                 unsigned int format_height, unsigned int format_width,
-                                 unsigned int format_channels, unsigned int format_colors,
+                                unsigned int format_height,
+                                unsigned int format_width,
+                                unsigned int format_channels,
+                                unsigned int format_colors,
                                 etBlinkenProto proto)
 {
   int device_output_active, err;
@@ -373,14 +387,14 @@ static int open_and_output_loop( SOCKET udpSocket, char * device,
   printf("receiving frames and outputting them to \"%s\"...\n", device);
   device_output_active = 1;
 
-  for( ; ; )
-  {
+  for (;;) {
 
     // try to open device and output frames
     err = open_and_output(udpSocket, device,
                           &device_output_active,
-                           serial_settings_change, serial_settings, serial_speed,
-                           format_change, format_height, format_width, format_channels, format_colors,
+                          serial_settings_change, serial_settings,
+                          serial_speed, format_change, format_height,
+                          format_width, format_channels, format_colors,
                           proto);
     if (err != 0 || !reopen_device)
       break;
@@ -392,8 +406,9 @@ static int open_and_output_loop( SOCKET udpSocket, char * device,
 
     // only fetch data from socket for a short time
     err = recv_and_out(udpSocket, -1, &device_output_active,
-                        format_change, format_height, format_width, format_channels, format_colors,
-                        proto, 1, reopen_device_ms );
+                       format_change, format_height, format_width,
+                       format_channels, format_colors, proto, 1,
+                       reopen_device_ms);
     if (err != 0)
       break;;
 
@@ -412,7 +427,8 @@ int main( int argCnt, char * * args )
   int i, bound, serial_settings, serial_speed;
   SOCKET udpSocket;
   etBlinkenProto proto;
-  unsigned int format_change, format_height, format_width, format_channels, format_colors;
+  unsigned int format_change, format_height, format_width, format_channels,
+      format_colors;
   unsigned int height, width, channels, colors, reopen_device_ms;
   int serial_settings_change, reopen_device;
   char txt[64];
@@ -427,11 +443,11 @@ int main( int argCnt, char * * args )
          "Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>\n"
          "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"
          "a blinkenarea.org project\n\n",
-          BLINKENLIB_VERSION_MAJOR, BLINKENLIB_VERSION_MINOR, BLINKENLIB_VERSION_REVISION );
+         BLINKENLIB_VERSION_MAJOR, BLINKENLIB_VERSION_MINOR,
+         BLINKENLIB_VERSION_REVISION);
 
   // print syntax
-  if( argCnt <= 1 )
-  {
+  if (argCnt <= 1) {
     printf("syntax: %s <parameter> [...]\n\n"
            "parameters:\n"
            "  -l [<ip>:]<port>\n"
@@ -449,15 +465,12 @@ int main( int argCnt, char * * args )
            "     settings to use for serial devices (defaults to no change)\n"
            "  -o <milliseconds>\n"
            "     reopen device after short time on error (defaults to not reopen)\n"
-            "\n",
-            args[0] );
+           "\n", args[0]);
     return 0;
   }
-
   // create udp socket
   udpSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-  if( udpSocket == INVALID_SOCKET )
-  {
+  if (udpSocket == INVALID_SOCKET) {
     printf("cannot create UDP socket\n");
     return -1;
   }
@@ -475,17 +488,13 @@ int main( int argCnt, char * * args )
   serial_speed = 0;
   serial_settings_change = 0;
   reopen_device = 0;
-  for( i = 1; i < argCnt; i++ )
-  {
+  for (i = 1; i < argCnt; i++) {
 
     // local address
-    if( strcmp( args[i], "-l" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    if (strcmp(args[i], "-l") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( sscanf( args[i], "%32[0-9.]:%hu", txt, &port ) == 2 )
-        {
+        if (sscanf(args[i], "%32[0-9.]:%hu", txt, &port) == 2) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(port);
           addr.sin_addr.s_addr = inet_addr(txt);
@@ -493,9 +502,7 @@ int main( int argCnt, char * * args )
             printf("could not set local address to \"%s\"\n", args[i]);
           else
             bound = 1;
-        }
-        else if( sscanf( args[i], "%hu", &port ) == 1 )
-        {
+        } else if (sscanf(args[i], "%hu", &port) == 1) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(port);
           addr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -503,48 +510,35 @@ int main( int argCnt, char * * args )
             printf("could not set local address to \"%s\"\n", args[i]);
           else
             bound = 1;
-        }
-        else
+        } else
           printf("invalid local address \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing local address for \"-l\"\n");
     }
-
     // remote address
-    else if( strcmp( args[i], "-r" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-r") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( sscanf( args[i], "%32[0-9.]:%hu", txt, &port ) == 2 )
-        {
+        if (sscanf(args[i], "%32[0-9.]:%hu", txt, &port) == 2) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(port);
           addr.sin_addr.s_addr = inet_addr(txt);
           if (connect(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) != 0)
             printf("could not set remote address to \"%s\"\n", args[i]);
-        }
-        else if( sscanf( args[i], "%32[0-9.]", txt ) == 1 )
-        {
+        } else if (sscanf(args[i], "%32[0-9.]", txt) == 1) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(23230);
           addr.sin_addr.s_addr = inet_addr(txt);
           if (connect(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) != 0)
             printf("could not set remote address to \"%s\"\n", args[i]);
-        }
-        else
+        } else
           printf("invalid remote address \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing remote address for \"-r\"\n");
     }
-
     // protocol to output frames in
-    else if( strcmp( args[i], "-p" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-p") == 0) {
+      if (i + 1 < argCnt) {
         i++;
         if (strcasecmp(args[i], "BLP") == 0)
           proto = BlinkenProtoBlp;
@@ -554,87 +548,68 @@ int main( int argCnt, char * * args )
           proto = BlinkenProtoMcuf;
         else
           printf("unknown protocol \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing protocol for \"-p\"\n");
     }
-
     // format to output frames in
-    else if( strcmp( args[i], "-f" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-f") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( sscanf( args[i], "%ux%u-%u/%u", &width, &height, &channels, &colors ) == 4 &&
-            width > 0 && width < 1000 && height > 0 && height < 1000 &&
-            channels > 0 && channels < 20 && colors > 1 && colors <= 256 )
-        {
+        if (sscanf
+            (args[i], "%ux%u-%u/%u", &width, &height, &channels, &colors) == 4
+            && width > 0 && width < 1000 && height > 0 && height < 1000
+            && channels > 0 && channels < 20 && colors > 1 && colors <= 256) {
           format_change = 1;
           format_height = height;
           format_width = width;
           format_channels = channels;
           format_colors = colors;
-        }
-        else
+        } else
           printf("invalid frame format \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing frame format for \"-r\"\n");
     }
-
     // device to output frames to
-    else if( strcmp( args[i], "-d" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-d") == 0) {
+      if (i + 1 < argCnt) {
         i++;
         device = args[i];
-      }
-      else
+      } else
         printf("missing device name for \"-d\"\n");
     }
-
     // settings for serial output devices
-    else if( strcmp( args[i], "-s" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-s") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( serial_settings_parse( args[i], &serial_settings, &serial_speed ) )
-        {
+        if (serial_settings_parse(args[i], &serial_settings, &serial_speed)) {
           serial_settings_change = 1;
-        }
-        else
+        } else
           printf("invalid serial settings \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing serial settings for \"-s\"\n");
     }
-
     // reopen device on error after some time
-    else if( strcmp( args[i], "-o" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-o") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( sscanf( args[i], "%u", &reopen_device_ms ) == 1 && reopen_device_ms >= 1 )
+        if (sscanf(args[i], "%u", &reopen_device_ms) == 1
+            && reopen_device_ms >= 1)
           reopen_device = 1;
         else
           printf("invalid number of milliseconds \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing time for \"-o\"\n");
     }
-
     // unknown parameter
     else
-      printf( "unknown parameter \"%s\", call without parameters to get help\n", args[i] );
+      printf
+          ("unknown parameter \"%s\", call without parameters to get help\n",
+           args[i]);
 
   }     // for( i ...
 
   // try to bind if not bound
-  if( ! bound )
-  {
+  if (!bound) {
     printf("no local address to receive frames on,\n"
            "  using default local address \"0.0.0.0:2323\"\n");
     addr.sin_family = AF_INET;
@@ -642,8 +617,7 @@ int main( int argCnt, char * * args )
     addr.sin_addr.s_addr = htonl(INADDR_ANY);
     if (bind(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) == 0)
       bound = 1;
-    else
-    {
+    else {
       printf("could not set local address to \"0.0.0.0:2323\"\n");
       close(udpSocket);
       return -1;
@@ -654,8 +627,8 @@ int main( int argCnt, char * * args )
   open_and_output_loop(udpSocket, device,
                        serial_settings_change, serial_settings, serial_speed,
                        reopen_device, reopen_device_ms,
-                        format_change, format_height, format_width, format_channels, format_colors,
-                        proto );
+                       format_change, format_height, format_width,
+                       format_channels, format_colors, proto);
 
   // close socket
   close(udpSocket);

BlinkenLib/BlinkenOutputWin.c

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #include <fcntl.h>
 #include <stdlib.h>
@@ -31,38 +29,23 @@ static int serial_settings_parse( char * str )
       baud != 2400 &&
       baud != 4800 &&
       baud != 9600 &&
-      baud != 19200 &&
-      baud != 38400 &&
-      baud != 57600 &&
-      baud != 115200 )
-  {
+      baud != 19200 && baud != 38400 && baud != 57600 && baud != 115200) {
     printf("illegal baudrate: %d\n", baud);
     return 0;
   }
-
   // parity
   if (parity != 'n' && parity != 'N' &&
-      parity != 'e' && parity != 'E' &&
-      parity != 'o' && parity != 'O' )
-  {
+      parity != 'e' && parity != 'E' && parity != 'o' && parity != 'O') {
     printf("invalid parity: %c\n", parity);
     return 0;
   }
-
   // data bits
-  if( data != 5 &&
-      data != 6 &&
-      data != 7 &&
-      data != 8 )
-  {
+  if (data != 5 && data != 6 && data != 7 && data != 8) {
     printf("illegal number of data bits: %d\n", data);
     return 0;
   }
-
   // stop bits
-  if( stop != 1 &&
-      stop == 2 )
-  {
+  if (stop != 1 && stop == 2) {
     printf("illegal number of stop bits: %d\n", stop);
     return 0;
   }
@@ -78,25 +60,22 @@ static int serial_settings_set( HANDLE hDev, char * settings )
   COMMTIMEOUTS CommTimeouts;
 
   // set serial parameters
-  if( ! GetCommState( hDev, &PortDcb ) )
-  {
+  if (!GetCommState(hDev, &PortDcb)) {
     printf("error getting device comm state: error %u\n", GetLastError());
     return 0;
   }
-  if( ! BuildCommDCB( hDev, &PortDcb ) )
-  {
+  if (!BuildCommDCB(hDev, &PortDcb)) {
     printf("error building comm state: error %u\n", GetLastError());
     return 0;
   }
-  if( ! SetCommState( hDev, &PortDcb ) )
-  {
+  if (!SetCommState(hDev, &PortDcb)) {
     printf("error setting device comm state: error %u\n", GetLastError());
     return 0;
   }
-
   // set timeout parameters
   // maximum time between arrival of two characters: 10 ms
-  //if this time elapses, read command will return even if buffer is not filled completely
+  // if this time elapses, read command will return even if buffer is not
+  // filled completely
   CommTimeouts.ReadIntervalTimeout = 10;
   // disable read timeouts
   CommTimeouts.ReadTotalTimeoutConstant = 0;
@@ -104,12 +83,11 @@ static int serial_settings_set( HANDLE hDev, char * settings )
   // disable write timeouts
   CommTimeouts.WriteTotalTimeoutConstant = 0;
   CommTimeouts.WriteTotalTimeoutMultiplier = 0;
-  if( ! SetCommTimeouts( hDev, &CommTimeouts ) )
-  {
-    printf( "error setting device timeout parameters: error %u\n", GetLastError( ) );
+  if (!SetCommTimeouts(hDev, &CommTimeouts)) {
+    printf("error setting device timeout parameters: error %u\n",
+           GetLastError());
     return 0;
   }
-
   // success
   return 1;
 }
@@ -121,9 +99,10 @@ static int recv_and_out( SOCKET udpSocket, HANDLE hDev,
                         int *p_device_output_active,
                         unsigned int format_change,
                         unsigned int format_height, unsigned int format_width,
-                         unsigned int format_channels, unsigned int format_colors,
-                         etBlinkenProto proto,
-                         int use_msecs, unsigned int msecs, int is_serial_device )
+                        unsigned int format_channels,
+                        unsigned int format_colors, etBlinkenProto proto,
+                        int use_msecs, unsigned int msecs,
+                        int is_serial_device)
 {
   fd_set readFds, errFds;
   stBlinkenFrame *pFrame;
@@ -134,8 +113,7 @@ static int recv_and_out( SOCKET udpSocket, HANDLE hDev,
   COMSTAT ComStat;
 
   dev_eof = 0;
-  for( ; ; )
-  {
+  for (;;) {
     // wait for next frame
     FD_ZERO(&readFds);
     FD_SET(udpSocket, &readFds);
@@ -147,29 +125,23 @@ static int recv_and_out( SOCKET udpSocket, HANDLE hDev,
       timeout.tv_sec = msecs / 1000;
       timeout.tv_usec = msecs % 1000 * 1000;
       p_timeout = &timeout;
-    }
-    else
+    } else
       p_timeout = NULL;
     if (select(0, &readFds, NULL, &errFds, p_timeout) < 0)      // error
     {
       printf("error during select: %s\n", strerror(errno));
       return -1;
     }
-
     // error on socket
-    if( FD_ISSET( udpSocket, &errFds ) )
-    {
+    if (FD_ISSET(udpSocket, &errFds)) {
       printf("error on socket\n");
       return -1;
     }
-
     // received frame
-    if( FD_ISSET( udpSocket, &readFds ) )
-    {
+    if (FD_ISSET(udpSocket, &readFds)) {
       // fetch data
       len = recv(udpSocket, buffer, sizeof(buffer), 0);
-      if( len < 0 )
-      {
+      if (len < 0) {
         printf("could not read from socket\n");
         return -1;
       }
@@ -178,11 +150,11 @@ static int recv_and_out( SOCKET udpSocket, HANDLE hDev,
 
       // get frame from data
       pFrame = BlinkenFrameFromNetwork(buffer, len, NULL);
-      if( pFrame != NULL )
-      {
+      if (pFrame != NULL) {
         // change format
         if (format_change)
-          BlinkenFrameResize( pFrame, format_height, format_width, format_channels, format_colors - 1 );
+          BlinkenFrameResize(pFrame, format_height, format_width,
+                             format_channels, format_colors - 1);
 
         // create output data from frame
         len = BlinkenFrameToNetwork(pFrame, proto, buffer, sizeof(buffer));
@@ -191,10 +163,9 @@ static int recv_and_out( SOCKET udpSocket, HANDLE hDev,
         BlinkenFrameFree(pFrame);
 
         // output data to device
-        if( hDev != INVALID_HANDLE_VALUE && len > 0 )
-        {
-          if( ! WriteFile( hDev, buffer, len, &DevWrLen, NULL ) || (int)DevWrLen != len )
-          {
+        if (hDev != INVALID_HANDLE_VALUE && len > 0) {
+          if (!WriteFile(hDev, buffer, len, &DevWrLen, NULL)
+              || (int)DevWrLen != len) {
             if (*p_device_output_active)
               printf("error writing to device: error %lu\n", GetLastError());
             break;
@@ -206,23 +177,18 @@ static int recv_and_out( SOCKET udpSocket, HANDLE hDev,
         }
       }
     }
-
     // get state of serial device
-    if( hDev != INVALID_HANDLE_VALUE && is_serial_device )
-	{
+    if (hDev != INVALID_HANDLE_VALUE && is_serial_device) {
       ClearCommError(hDev, &Err, &ComStat);
       // reception error
-	  if( Err & (CE_BREAK | CE_FRAME | CE_OVERRUN | CE_RXOVER | CE_RXPARITY) )
-	  {
+      if (Err & (CE_BREAK | CE_FRAME | CE_OVERRUN | CE_RXOVER | CE_RXPARITY)) {
         if (*p_device_output_active)
           printf("error reading from device (comm err=%X)\n", Err);
         break;
       }
     }
-
     // using time limit
-    if( use_msecs )
-    {
+    if (use_msecs) {
       unsigned int msec;
       // get time elapsed
       end = GetTickCount();
@@ -244,38 +210,37 @@ static int open_and_output( SOCKET udpSocket, char * device,
                            int *p_device_output_active,
                            int serial_settings_change, char *serial_settings,
                            unsigned int format_change,
-                            unsigned int format_height, unsigned int format_width,
-                            unsigned int format_channels, unsigned int format_colors,
-                            etBlinkenProto proto )
+                           unsigned int format_height,
+                           unsigned int format_width,
+                           unsigned int format_channels,
+                           unsigned int format_colors, etBlinkenProto proto)
 {
   HANDLE hDev;
   int err;
 
   // open device
-  hDev = CreateFile( device, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL );
-  if( hDev == INVALID_HANDLE_VALUE )
-  {
+  hDev =
+      CreateFile(device, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
+                 0, NULL);
+  if (hDev == INVALID_HANDLE_VALUE) {
     if (*p_device_output_active)
       printf("could not open \"%s\": error %u\n", device, GetLastError());
     return 0;
   }
-
   // setup serial port
-  if( serial_settings_change )
-  {
-    if( ! serial_settings_set( hDev, serial_settings ) )
-    {
+  if (serial_settings_change) {
+    if (!serial_settings_set(hDev, serial_settings)) {
       if (*p_device_output_active)
         printf("could not set serial port to \"%s\"\n", serial_settings);
       CloseHandle(hDev);
       return 0;
     }
   }
-
   // receive frames and output to device
   err = recv_and_out(udpSocket, hDev, p_device_output_active,
-                      format_change, format_height, format_width, format_channels, format_colors,
-                      proto, 0, 0, serial_settings_change );
+                     format_change, format_height, format_width,
+                     format_channels, format_colors, proto, 0, 0,
+                     serial_settings_change);
 
   // close device
   CloseHandle(hDev);
@@ -286,11 +251,14 @@ static int open_and_output( SOCKET udpSocket, char * device,
 // open device and output frames in a loop
 // returns error code (not for device-errors, 0 for success)
 static int open_and_output_loop(SOCKET udpSocket, char *device,
-                                 int serial_settings_change, char * serial_settings,
-                                 int reopen_device, unsigned int reopen_device_ms,
+                                int serial_settings_change,
+                                char *serial_settings, int reopen_device,
+                                unsigned int reopen_device_ms,
                                 unsigned int format_change,
-                                 unsigned int format_height, unsigned int format_width,
-                                 unsigned int format_channels, unsigned int format_colors,
+                                unsigned int format_height,
+                                unsigned int format_width,
+                                unsigned int format_channels,
+                                unsigned int format_colors,
                                 etBlinkenProto proto)
 {
   int device_output_active, err;
@@ -298,15 +266,14 @@ static int open_and_output_loop( SOCKET udpSocket, char * device,
   printf("receiving frames and outputting them to \"%s\"...\n", device);
   device_output_active = 1;
 
-  for( ; ; )
-  {
+  for (;;) {
 
     // try to open device and output frames
     err = open_and_output(udpSocket, device,
                           &device_output_active,
                           serial_settings_change, serial_settings,
-                           format_change, format_height, format_width, format_channels, format_colors,
-                           proto );
+                          format_change, format_height, format_width,
+                          format_channels, format_colors, proto);
     if (err != 0 || !reopen_device)
       break;
 
@@ -317,8 +284,9 @@ static int open_and_output_loop( SOCKET udpSocket, char * device,
 
     // only fetch data from socket for a short time
     err = recv_and_out(udpSocket, INVALID_HANDLE_VALUE, &device_output_active,
-                        format_change, format_height, format_width, format_channels, format_colors,
-                        proto, 1, reopen_device_ms, serial_settings_change );
+                       format_change, format_height, format_width,
+                       format_channels, format_colors, proto, 1,
+                       reopen_device_ms, serial_settings_change);
     if (err != 0)
       break;
 
@@ -339,7 +307,8 @@ int main( int argCnt, char * * args )
   SOCKET udpSocket;
   char *serial_settings;
   etBlinkenProto proto;
-  unsigned int format_change, format_height, format_width, format_channels, format_colors;
+  unsigned int format_change, format_height, format_width, format_channels,
+      format_colors;
   unsigned int height, width, channels, colors, reopen_device_ms;
   int serial_settings_change, reopen_device, unblock;
   char txt[64];
@@ -354,8 +323,7 @@ int main( int argCnt, char * * args )
          "a blinkenarea.org project\n\n");
 
   // print syntax
-  if( argCnt <= 1 )
-  {
+  if (argCnt <= 1) {
     printf("syntax: %s <parameter> [...]\n\n"
            "parameters:\n"
            "  -l [<ip>:]<port>\n"
@@ -373,8 +341,7 @@ int main( int argCnt, char * * args )
            "     settings to use for serial devices (defaults to no change)\n"
            "  -o <milliseconds>\n"
            "     reopen device after short time on error (defaults to not reopen)\n"
-            "\n",
-            args[0] );
+           "\n", args[0]);
     return 0;
   }
 
@@ -382,8 +349,7 @@ int main( int argCnt, char * * args )
 
   // create udp socket
   udpSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-  if( udpSocket == INVALID_SOCKET )
-  {
+  if (udpSocket == INVALID_SOCKET) {
     printf("cannot create UDP socket: error %lu\n", WSAGetLastError());
     WSACleanup();
     return -1;
@@ -392,8 +358,7 @@ int main( int argCnt, char * * args )
 
   // unblock udp socket
   unblock = 1;
-  if( ioctlsocket( udpSocket, FIONBIO, &unblock ) == SOCKET_ERROR )
-  {
+  if (ioctlsocket(udpSocket, FIONBIO, &unblock) == SOCKET_ERROR) {
     printf("cannot unblock UDP socket: error %lu\n", WSAGetLastError());
     closesocket(udpSocket);
     WSACleanup();
@@ -410,17 +374,13 @@ int main( int argCnt, char * * args )
   device = "NUL";
   serial_settings_change = 0;
   reopen_device = 0;
-  for( i = 1; i < argCnt; i++ )
-  {
+  for (i = 1; i < argCnt; i++) {
 
     // local address
-    if( strcmp( args[i], "-l" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    if (strcmp(args[i], "-l") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( sscanf( args[i], "%32[0-9.]:%hu", txt, &port ) == 2 )
-        {
+        if (sscanf(args[i], "%32[0-9.]:%hu", txt, &port) == 2) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(port);
           addr.sin_addr.s_addr = inet_addr(txt);
@@ -428,9 +388,7 @@ int main( int argCnt, char * * args )
             printf("could not set local address to \"%s\"\n", args[i]);
           else
             bound = 1;
-        }
-        else if( sscanf( args[i], "%hu", &port ) == 1 )
-        {
+        } else if (sscanf(args[i], "%hu", &port) == 1) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(port);
           addr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -438,48 +396,35 @@ int main( int argCnt, char * * args )
             printf("could not set local address to \"%s\"\n", args[i]);
           else
             bound = 1;
-        }
-        else
+        } else
           printf("invalid local address \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing local address for \"-l\"\n");
     }
-
     // remote address
-    else if( strcmp( args[i], "-r" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-r") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( sscanf( args[i], "%32[0-9.]:%hu", txt, &port ) == 2 )
-        {
+        if (sscanf(args[i], "%32[0-9.]:%hu", txt, &port) == 2) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(port);
           addr.sin_addr.s_addr = inet_addr(txt);
           if (connect(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) != 0)
             printf("could not set remote address to \"%s\"\n", args[i]);
-        }
-        else if( sscanf( args[i], "%32[0-9.]", txt ) == 1 )
-        {
+        } else if (sscanf(args[i], "%32[0-9.]", txt) == 1) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(23230);
           addr.sin_addr.s_addr = inet_addr(txt);
           if (connect(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) != 0)
             printf("could not set remote address to \"%s\"\n", args[i]);
-        }
-        else
+        } else
           printf("invalid remote address \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing remote address for \"-r\"\n");
     }
-
     // protocol to output frames in
-    else if( strcmp( args[i], "-p" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-p") == 0) {
+      if (i + 1 < argCnt) {
         i++;
         if (stricmp(args[i], "BLP") == 0)
           proto = BlinkenProtoBlp;
@@ -489,88 +434,69 @@ int main( int argCnt, char * * args )
           proto = BlinkenProtoMcuf;
         else
           printf("unknown protocol \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing protocol for \"-p\"\n");
     }
-
     // format to output frames in
-    else if( strcmp( args[i], "-f" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-f") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( sscanf( args[i], "%ux%u-%u/%u", &width, &height, &channels, &colors ) == 4 &&
-            width > 0 && width < 1000 && height > 0 && height < 1000 &&
-            channels > 0 && channels < 20 && colors > 1 && colors <= 256 )
-        {
+        if (sscanf
+            (args[i], "%ux%u-%u/%u", &width, &height, &channels, &colors) == 4
+            && width > 0 && width < 1000 && height > 0 && height < 1000
+            && channels > 0 && channels < 20 && colors > 1 && colors <= 256) {
           format_change = 1;
           format_height = height;
           format_width = width;
           format_channels = channels;
           format_colors = colors;
-        }
-        else
+        } else
           printf("invalid frame format \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing frame format for \"-r\"\n");
     }
-
     // device to output frames to
-    else if( strcmp( args[i], "-d" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-d") == 0) {
+      if (i + 1 < argCnt) {
         i++;
         device = args[i];
-      }
-      else
+      } else
         printf("missing device name for \"-d\"\n");
     }
-
     // settings for serial output devices
-    else if( strcmp( args[i], "-s" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-s") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( serial_settings_parse( args[i] ) )
-        {
+        if (serial_settings_parse(args[i])) {
           serial_settings_change = 1;
           serial_settings = args[i];
-        }
-        else
+        } else
           printf("invalid serial settings \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing serial settings for \"-s\"\n");
     }
-
     // reopen device on error after some time
-    else if( strcmp( args[i], "-o" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-o") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( sscanf( args[i], "%u", &reopen_device_ms ) == 1 && reopen_device_ms >= 1 )
+        if (sscanf(args[i], "%u", &reopen_device_ms) == 1
+            && reopen_device_ms >= 1)
           reopen_device = 1;
         else
           printf("invalid number of milliseconds \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing time for \"-o\"\n");
     }
-
     // unknown parameter
     else
-      printf( "unknown parameter \"%s\", call without parameters to get help\n", args[i] );
+      printf
+          ("unknown parameter \"%s\", call without parameters to get help\n",
+           args[i]);
 
   }     // for( i ...
 
   // try to bind if not bound
-  if( ! bound )
-  {
+  if (!bound) {
     printf("no local address to receive frames on,\n"
            "  using default local address \"0.0.0.0:2323\"\n");
     addr.sin_family = AF_INET;
@@ -578,8 +504,7 @@ int main( int argCnt, char * * args )
     addr.sin_addr.s_addr = htonl(INADDR_ANY);
     if (bind(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) == 0)
       bound = 1;
-    else
-    {
+    else {
       printf("could not set local address to \"0.0.0.0:2323\"\n");
       closesocket(udpSocket);
       return -1;
@@ -590,8 +514,8 @@ int main( int argCnt, char * * args )
   open_and_output_loop(udpSocket, device,
                        serial_settings_change, serial_settings,
                        reopen_device, reopen_device_ms,
-                        format_change, format_height, format_width, format_channels, format_colors,
-                        proto );
+                       format_change, format_height, format_width,
+                       format_channels, format_colors, proto);
 
   // close socket
   closesocket(udpSocket);

BlinkenLib/BlinkenRecv.c

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,11 +34,11 @@ int main( int argCnt, char * * args )
          "Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>\n"
          "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"
          "a blinkenarea.org project\n\n",
-          BLINKENLIB_VERSION_MAJOR, BLINKENLIB_VERSION_MINOR, BLINKENLIB_VERSION_REVISION );
+         BLINKENLIB_VERSION_MAJOR, BLINKENLIB_VERSION_MINOR,
+         BLINKENLIB_VERSION_REVISION);
 
   // print syntax
-  if( argCnt <= 1 )
-  {
+  if (argCnt <= 1) {
     printf("syntax: %s <parameter> [...]\n\n"
            "parameters:\n"
            "  -l [<ip>:]<port>\n"
@@ -65,8 +62,7 @@ int main( int argCnt, char * * args )
 
   // create udp socket
   udpSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-  if( udpSocket == INVALID_SOCKET )
-  {
+  if (udpSocket == INVALID_SOCKET) {
     printf("cannot create UDP socket\n");
 #ifdef WIN32
     WSACleanup();
@@ -77,17 +73,13 @@ int main( int argCnt, char * * args )
 
   // process parameters
   timeout = 5000;
-  for( i = 1; i < argCnt; i++ )
-  {
+  for (i = 1; i < argCnt; i++) {
 
     // local address
-    if( strcmp( args[i], "-l" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    if (strcmp(args[i], "-l") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( sscanf( args[i], "%32[0-9.]:%hu", txt, &port ) == 2 )
-        {
+        if (sscanf(args[i], "%32[0-9.]:%hu", txt, &port) == 2) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(port);
           addr.sin_addr.s_addr = inet_addr(txt);
@@ -95,9 +87,7 @@ int main( int argCnt, char * * args )
             printf("could not set local address to \"%s\"\n", args[i]);
           else
             bound = 1;
-        }
-        else if( sscanf( args[i], "%hu", &port ) == 1 )
-        {
+        } else if (sscanf(args[i], "%hu", &port) == 1) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(port);
           addr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -105,63 +95,46 @@ int main( int argCnt, char * * args )
             printf("could not set local address to \"%s\"\n", args[i]);
           else
             bound = 1;
-        }
-        else
+        } else
           printf("invalid local address \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing local address for \"-l\"\n");
     }
-
     // remote address
-    else if( strcmp( args[i], "-r" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-r") == 0) {
+      if (i + 1 < argCnt) {
         i++;
-        if( sscanf( args[i], "%32[0-9.]:%hu", txt, &port ) == 2 )
-        {
+        if (sscanf(args[i], "%32[0-9.]:%hu", txt, &port) == 2) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(port);
           addr.sin_addr.s_addr = inet_addr(txt);
           if (connect(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) != 0)
             printf("could not set remote address to \"%s\"\n", args[i]);
-        }
-        else if( sscanf( args[i], "%32[0-9.]", txt ) == 1 )
-        {
+        } else if (sscanf(args[i], "%32[0-9.]", txt) == 1) {
           addr.sin_family = AF_INET;
           addr.sin_port = htons(23230);
           addr.sin_addr.s_addr = inet_addr(txt);
           if (connect(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) != 0)
             printf("could not set remote address to \"%s\"\n", args[i]);
-        }
-        else
+        } else
           printf("invalid remote address \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing remote address for \"-r\"\n");
     }
-
     // timeout
-    else if( strcmp( args[i], "-t" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-t") == 0) {
+      if (i + 1 < argCnt) {
         i++;
         if (sscanf(args[i], "%u", &val) == 1)
           timeout = val;
         else
           printf("invalid timeout value \"%s\"\n", args[i]);
-      }
-      else
+      } else
         printf("missing timeout value for \"-t\"\n");
     }
-
     // receive movie and write it to file
-    else if( strcmp( args[i], "-o" ) == 0 )
-    {
-      if( i + 1 < argCnt )
-      {
+    else if (strcmp(args[i], "-o") == 0) {
+      if (i + 1 < argCnt) {
         i++;
         if (!bound)     // try to bind if not bound
         {
@@ -175,31 +148,29 @@ int main( int argCnt, char * * args )
           else
             bound = 1;
         }
-        if( bound )
-        {
+        if (bound) {
           printf("receiving movie for file \"%s\"...\n", args[i]);
           pMovie = BlinkenMovieReceive(udpSocket, timeout, NULL);
           if (pMovie == NULL)
             printf("could not receive movie for file \"%s\"\n", args[i]);
-          else
-          {
+          else {
             if (BlinkenMovieSave(pMovie, args[i]) < 0)
               printf("could not write movie \"%s\"\n", args[i]);
             else
               printf("movie \"%s\" written\n", args[i]);
             BlinkenMovieFree(pMovie);
           }
-        }
-        else
-          printf( "no local address set to receive movie for file \"%s\" on\n", args[i] );
-      }
-      else
+        } else
+          printf("no local address set to receive movie for file \"%s\" on\n",
+                 args[i]);
+      } else
         printf("missing output filename for \"-o\"\n");
     }
-
     // unknown parameter
     else
-      printf( "unknown parameter \"%s\", call without parameters to get help\n", args[i] );
+      printf
+          ("unknown parameter \"%s\", call without parameters to get help\n",
+           args[i]);
 
   }     // for( i ...
 

BlinkenLib/BlinkenSend.c

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,11 +37,11 @@ int main( int argCnt, char * * args )
          "Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>\n"
          "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n"
          "a blinkenarea.org project\n\n",
-          BLINKENLIB_VERSION_MAJOR, BLINKENLIB_VERSION_MINOR, BLINKENLIB_VERSION_REVISION );
+         BLINKENLIB_VERSION_MAJOR, BLINKENLIB_VERSION_MINOR,
+         BLINKENLIB_VERSION_REVISION);
 
   // print syntax
-  if( argCnt <= 1 )
-  {
+  if (argCnt <= 1) {
     printf("syntax: %s <parameter> [...]\n\n"
            "parameters:\n"
            "  -s [<ip>:]<port>\n"
@@ -74,19 +71,16 @@ int main( int argCnt, char * * args )
 
   // create udp socket
   udpSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-  if( udpSocket == INVALID_SOCKET )
-  {
+  if (udpSocket == INVALID_SOCKET) {
     printf("cannot create UDP socket\n");
 #ifdef WIN32
     WSACleanup();
 #endif
     return -1;
   }
-
   // loop
   loop_cnt = 1;
-  for( loop = 0; loop < loop_cnt || loop_cnt == 0; loop++ )
-  {
+  for (loop = 0; loop < loop_cnt || loop_cnt == 0; loop++) {
 
     // print loop message
     if (loop_cnt > 1)
@@ -99,76 +93,61 @@ int main( int argCnt, char * * args )
     proto = BlinkenProtoMcuf;
     maxidle = 3000;
     send_cnt = 1;
-    for( i = 1; i < argCnt; i++ )
-    {
+    for (i = 1; i < argCnt; i++) {
 
       // source address
-      if( strcmp( args[i], "-s" ) == 0 )
-      {
-        if( i + 1 < argCnt )
-        {
+      if (strcmp(args[i], "-s") == 0) {
+        if (i + 1 < argCnt) {
           i++;
-          if( sscanf( args[i], "%32[0-9.]:%hu", txt, &port ) == 2 )
-          {
+          if (sscanf(args[i], "%32[0-9.]:%hu", txt, &port) == 2) {
             addr.sin_family = AF_INET;
             addr.sin_port = htons(port);
             addr.sin_addr.s_addr = inet_addr(txt);
             if (bind(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) != 0)
               printf("could not set source address to \"%s\"\n", args[i]);
-          }
-          else if( sscanf( args[i], "%hu", &port ) == 1 )
-          {
+          } else if (sscanf(args[i], "%hu", &port) == 1) {
             addr.sin_family = AF_INET;
             addr.sin_port = htons(port);
             addr.sin_addr.s_addr = htonl(INADDR_ANY);
             if (bind(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) != 0)
               printf("could not set source address to \"%s\"\n", args[i]);
-          }
-          else
+          } else
             printf("invalid source address \"%s\"\n", args[i]);
-        }
-        else
+        } else
           printf("missing source address for \"-s\"\n");
       }
-
       // destination address
-      else if( strcmp( args[i], "-d" ) == 0 )
-      {
-        if( i + 1 < argCnt )
-        {
+      else if (strcmp(args[i], "-d") == 0) {
+        if (i + 1 < argCnt) {
           i++;
-          if( sscanf( args[i], "%32[0-9.]:%hu", txt, &port ) == 2 )
-          {
+          if (sscanf(args[i], "%32[0-9.]:%hu", txt, &port) == 2) {
             addr.sin_family = AF_INET;
             addr.sin_port = htons(port);
             addr.sin_addr.s_addr = inet_addr(txt);
-            if( connect( udpSocket, (struct sockaddr *)&addr, sizeof( addr ) ) != 0 )
-              printf( "could not set destination address to \"%s\"\n", args[i] );
+            if (connect(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) !=
+                0)
+              printf("could not set destination address to \"%s\"\n",
+                     args[i]);
             else
               connected = 1;
-          }
-          else if( sscanf( args[i], "%32[0-9.]", txt ) == 1 )
-          {
+          } else if (sscanf(args[i], "%32[0-9.]", txt) == 1) {
             addr.sin_family = AF_INET;
             addr.sin_port = htons(2323);
             addr.sin_addr.s_addr = inet_addr(txt);
-            if( connect( udpSocket, (struct sockaddr *)&addr, sizeof( addr ) ) != 0 )
-              printf( "could not set destination address to \"%s\"\n", args[i] );
+            if (connect(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) !=
+                0)
+              printf("could not set destination address to \"%s\"\n",
+                     args[i]);
             else
               connected = 1;
-          }
-          else
+          } else
             printf("invalid destination address \"%s\"\n", args[i]);
-        }
-        else
+        } else
           printf("missing destination address for \"-d\"\n");
       }
-
       // protocol to use
-      else if( strcmp( args[i], "-p" ) == 0 )
-      {
-        if( i + 1 < argCnt )
-        {
+      else if (strcmp(args[i], "-p") == 0) {
+        if (i + 1 < argCnt) {
           i++;
           if (strcasecmp(args[i], "BLP") == 0)
             proto = BlinkenProtoBlp;
@@ -178,101 +157,86 @@ int main( int argCnt, char * * args )
             proto = BlinkenProtoMcuf;
           else
             printf("unknown protocol \"%s\"\n", args[i]);
-        }
-        else
+        } else
           printf("missing protocol for \"-p\"\n");
       }
-
       // maximum idle time
-      else if( strcmp( args[i], "-t" ) == 0 )
-      {
-        if( i + 1 < argCnt )
-        {
+      else if (strcmp(args[i], "-t") == 0) {
+        if (i + 1 < argCnt) {
           i++;
           if (sscanf(args[i], "%u", &ui) == 1)
             maxidle = ui;
           else
             printf("invalid maximum idle time value \"%s\"\n", args[i]);
-        }
-        else
+        } else
           printf("missing maximum idle time value for \"-t\"\n");
       }
-
       // number of times to send movies
-      else if( strcmp( args[i], "-n" ) == 0 )
-      {
-        if( i + 1 < argCnt )
-        {
+      else if (strcmp(args[i], "-n") == 0) {
+        if (i + 1 < argCnt) {
           i++;
           if (sscanf(args[i], "%u", &ui) == 1 && ui > 0)
             send_cnt = ui;
           else
             printf("invalid number \"%s\"\n", args[i]);
-        }
-        else
+        } else
           printf("missing number for \"-n\"\n");
       }
-
       // read movie and send it
-      else if( strcmp( args[i], "-i" ) == 0 )
-      {
-        if( i + 1 < argCnt )
-        {
+      else if (strcmp(args[i], "-i") == 0) {
+        if (i + 1 < argCnt) {
           i++;
           if (!connected)       // try to connect if not yet connected
           {
             printf("no destination address to sent movie \"%s\" to,\n"
-                    "  using default destination address \"127.0.0.1:2323\"\n", args[i] );
+                   "  using default destination address \"127.0.0.1:2323\"\n",
+                   args[i]);
             addr.sin_family = AF_INET;
             addr.sin_port = htons(2323);
             addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-            if( connect( udpSocket, (struct sockaddr *)&addr, sizeof( addr ) ) != 0 )
-              printf( "could not set destination address to \"127.0.0.1:2323\"\n" );
+            if (connect(udpSocket, (struct sockaddr *)&addr, sizeof(addr)) !=
+                0)
+              printf
+                  ("could not set destination address to \"127.0.0.1:2323\"\n");
             else
               connected = 1;
           }
-          if( connected )
-          {
+          if (connected) {
             pMovie = BlinkenMovieLoad(args[i]);
             if (pMovie == NULL)
               printf("could not read movie \"%s\"\n", args[i]);
-            else
-            {
+            else {
               printf("movie \"%s\" read\n", args[i]);
-              for( ui = 0; ui < send_cnt; ui++ )
-              {
-                printf( "sending movie \"%s\" (%u/%u)...\n", args[i], ui + 1, send_cnt );
+              for (ui = 0; ui < send_cnt; ui++) {
+                printf("sending movie \"%s\" (%u/%u)...\n", args[i], ui + 1,
+                       send_cnt);
                 BlinkenMovieSend(pMovie, udpSocket, proto, maxidle);
                 printf("movie \"%s\" sent\n", args[i]);
               }
               BlinkenMovieFree(pMovie);
             }
-          }
-          else
-            printf( "no destination address to sent movie \"%s\" to\n", args[i] );
-        }
-        else
+          } else
+            printf("no destination address to sent movie \"%s\" to\n",
+                   args[i]);
+        } else
           printf("missing input filename for \"-i\"\n");
       }
-
       // number of times to loop
-      else if( strcmp( args[i], "-l" ) == 0 )
-      {
-        if( i + 1 < argCnt )
-        {
+      else if (strcmp(args[i], "-l") == 0) {
+        if (i + 1 < argCnt) {
           i++;
           if (sscanf(args[i], "%u", &ui) == 1)
             loop_cnt = ui;
           else
             printf("invalid number \"%s\"\n", args[i]);
-        }
-        else
+        } else
           printf("missing number for \"-l\"\n");
       }
-
       // unknown parameter
       else
-        printf( "unknown parameter \"%s\", call without parameters to get help\n", args[i] );
+        printf
+            ("unknown parameter \"%s\", call without parameters to get help\n",
+             args[i]);
 
     }   // for( i ...
 

BlinkenLib/Tools.c

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #include <stdlib.h>
 
@@ -10,7 +8,8 @@
 
 void *malloc1D(int count1, int size)
 {
-  if( count1 < 1 ) count1 = 1;
+  if (count1 < 1)
+    count1 = 1;
   if (size < 1)
     return NULL;
 
@@ -23,8 +22,10 @@ void * * malloc2D( int count1, int count2, int size )
   char *p;
   void **ptr;
 
-  if( count1 < 1 ) count1 = 1;
-  if( count2 < 1 ) count2 = 1;
+  if (count1 < 1)
+    count1 = 1;
+  if (count2 < 1)
+    count2 = 1;
   if (size < 1)
     return NULL;
 
@@ -35,8 +36,7 @@ void * * malloc2D( int count1, int count2, int size )
 
   ptr = (void **)p;
   p += count1 * sizeof(void *);
-  for( i = 0; i < count1; i++ )
-  {
+  for (i = 0; i < count1; i++) {
     ptr[i] = (void *)p;
     p += count2 * size;
   }

BlinkenLib/Tools.h

View file @ 142b777

@@ -1,8 +1,6 @@
-/* BlinkenLib
- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
- * a blinkenarea.org project
- */
+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
+   Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
+   blinkenarea.org project */
 
 #ifndef INC_BlinkenLib_Tools
 #define INC_BlinkenLib_Tools

config/mng.c

View file @ 142b777

@@ -14,7 +14,8 @@ void my_mng_free( mng_ptr pPtr, mng_size_t __attribute__(( unused )) iSize )
 
 int main()
 {
-  mng_handle hMNG = mng_initialize( MNG_NULL, my_mng_alloc, my_mng_free, MNG_NULL ); 
+  mng_handle hMNG =
+      mng_initialize(MNG_NULL, my_mng_alloc, my_mng_free, MNG_NULL);
   mng_cleanup(&hMNG);
 
   return 0;


...	...	@@ -1,15 +1,14 @@
1		-/* BlinkenLib
2		- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
3		- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
4		- * a blinkenarea.org project
5		- */
	1	+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
	2	+ Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
	3	+ blinkenarea.org project */
6	4
7	5	#include <string.h>
8	6
9	7	#include <BlinkenLib/Tools.h>
10	8	#include <BlinkenLib/BlinkenColorizer.h>
11	9
12		-unsigned char BlinkenColorizerSolid( int step, int channels, int y, int x, int c )
	10	+unsigned char BlinkenColorizerSolid(int step, int channels, int y, int x,
	11	+ int c)
13	12	{
14	13	int substep, updown, chan;
15	14	step %= channels * 2 * 254;
...	...	@@ -34,14 +33,14 @@ unsigned char BlinkenColorizerSolid( int step, int channels, int y, int x, int c
34	33	y = x = 0; // keep compiler quiet
35	34	}
36	35
37		-unsigned char BlinkenColorizerRainbow( int step, int channels, int y, int x, int c )
	36	+unsigned char BlinkenColorizerRainbow(int step, int channels, int y, int x,
	37	+ int c)
38	38	{
39	39	return BlinkenColorizerSolid(step + ((x + y) * 64), channels, y, x, c);
40	40	}
41	41
42	42	// type describing a colorizing modes
43		-typedef struct _BlinkenColorizingModeDesc
44		-{
	43	+typedef struct _BlinkenColorizingModeDesc {
45	44	const char *name;
46	45	unsigned char (*func) (int step, int channels, int y, int x, int c);
47	46	} BlinkenColorizingModeDesc;
...	...	@@ -74,7 +73,8 @@ const char * BlinkenColorizerMode2Str( int mode )
74	73	}
75	74
76	75	// get color for colorizing
77		-unsigned char BlinkenColorizerGetColor( int channels, int mode, int step, int y, int x, int c )
	76	+unsigned char BlinkenColorizerGetColor(int channels, int mode, int step,
	77	+ int y, int x, int c)
78	78	{
79	79	if (mode < 0 \|\| mode >= (int)arr_cnt(BlinkenColorizingModeDescs))
80	80	return 255;

...	...	@@ -1,8 +1,6 @@
1		-/* BlinkenLib
2		- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
3		- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
4		- * a blinkenarea.org project
5		- */
	1	+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
	2	+ Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
	3	+ blinkenarea.org project */
6	4
7	5	#ifndef INC_BlinkenLib_BlinkenColorizer
8	6	#define INC_BlinkenLib_BlinkenColorizer
...	...	@@ -15,7 +13,7 @@ int BlinkenColorizerStr2Mode( const char * str );
15	13	const char *BlinkenColorizerMode2Str(int mode);
16	14
17	15	// get color for colorizing
18		-unsigned char BlinkenColorizerGetColor( int channels, int mode, int step, int y, int x, int c );
	16	+unsigned char BlinkenColorizerGetColor(int channels, int mode, int step,
	17	+ int y, int x, int c);
19	18
20	19	#endif // #ifndef INC_BlinkenLib_BlinkenColorizer
21		-

...	...	@@ -1,17 +1,18 @@
1		-/* BlinkenLib
2		- * Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
3		- * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html
4		- * a blinkenarea.org project
5		- */
	1	+/* BlinkenLib Copyright 2004-2011 Stefan Schuermans <stefan@blinkenarea.org>
	2	+ Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html a
	3	+ blinkenarea.org project */
6	4
7	5	#ifndef INC_BlinkenLib_BlinkenFrame
8	6	#define INC_BlinkenLib_BlinkenFrame
9	7
10	8	typedef struct sBlinkenFrame stBlinkenFrame;
11	9
12		-typedef enum eBlinkenProto { BlinkenProtoNone, BlinkenProtoBlp, BlinkenProtoEblp, BlinkenProtoMcuf } etBlinkenProto;
	10	+typedef enum eBlinkenProto { BlinkenProtoNone, BlinkenProtoBlp,
	11	+ BlinkenProtoEblp, BlinkenProtoMcuf
	12	+} etBlinkenProto;
13	13
14		-stBlinkenFrame * BlinkenFrameNew( int height, int width, int channels, int maxval, int duration );
	14	+stBlinkenFrame *BlinkenFrameNew(int height, int width, int channels,
	15	+ int maxval, int duration);
15	16
16	17	stBlinkenFrame BlinkenFrameClone(stBlinkenFrame pSrcFrame);
17	18
...	...	@@ -27,11 +28,14 @@ int BlinkenFrameGetMaxval( stBlinkenFrame * pFrame );
27	28	int BlinkenFrameGetDuration(stBlinkenFrame * pFrame);
28	29	void BlinkenFrameSetDuration(stBlinkenFrame * pFrame, int duration);
29	30
30		-unsigned char BlinkenFrameGetPixel( stBlinkenFrame * pFrame, int y, int x, int c );
31		-void BlinkenFrameSetPixel( stBlinkenFrame * pFrame, int y, int x, int c, unsigned char val );
	31	+unsigned char BlinkenFrameGetPixel(stBlinkenFrame * pFrame, int y, int x,
	32	+ int c);
	33	+void BlinkenFrameSetPixel(stBlinkenFrame * pFrame, int y, int x, int c,
	34	+ unsigned char val);
32	35
33	36	unsigned long BlinkenFrameGetColor(stBlinkenFrame * pFrame, int y, int x);
34		-void BlinkenFrameSetColor( stBlinkenFrame * pFrame, int y, int x, unsigned long color );
	37	+void BlinkenFrameSetColor(stBlinkenFrame * pFrame, int y, int x,
	38	+ unsigned long color);
35	39
36	40	int BlinkenFrameIsEmpty(stBlinkenFrame * pFrame);
37	41	// returns 1 if frame is empty (i.e. black), returns 0 otherwise
...	...	@@ -39,16 +43,20 @@ int BlinkenFrameIsEmpty( stBlinkenFrame * pFrame );
39	43	int BlinkenFrameCompare(stBlinkenFrame * pFrame1, stBlinkenFrame * pFrame2);
40	44	// returns -1 for frame1 smaller, 0 for equal, 1 for frame2 smaller
41	45
42		-void BlinkenFrameResize( stBlinkenFrame * pFrame, int height, int width, int channels, int maxval );
	46	+void BlinkenFrameResize(stBlinkenFrame * pFrame, int height, int width,
	47	+ int channels, int maxval);
43	48	void BlinkenFrameScale(stBlinkenFrame * pFrame, int height, int width);
44		-void BlinkenFrameColorize( stBlinkenFrame * pFrame, int channels, int mode, int step );
	49	+void BlinkenFrameColorize(stBlinkenFrame * pFrame, int channels, int mode,
	50	+ int step);
45	51
46	52	char BlinkenFrameToString(stBlinkenFrame pFrame);
47	53
48		-int BlinkenFrameToNetwork( stBlinkenFrame * pFrame, etBlinkenProto proto, char * pData, int maxLength );
	54	+int BlinkenFrameToNetwork(stBlinkenFrame * pFrame, etBlinkenProto proto,
	55	+ char *pData, int maxLength);
49	56	// returns length or -1 on error
50	57
51		-stBlinkenFrame * BlinkenFrameFromNetwork( char * pData, int length, etBlinkenProto * pProto );
	58	+stBlinkenFrame BlinkenFrameFromNetwork(char pData, int length,
	59	+ etBlinkenProto * pProto);
52	60	// returns protocol in *pProto if pProto not NULL
53	61
54	62	#endif // #ifndef INC_BlinkenLib_BlinkenFrame

...	...	@@ -14,7 +14,8 @@ void my_mng_free( mng_ptr pPtr, mng_size_t __attribute__(( unused )) iSize )
14	14
15	15	int main()
16	16	{
17		- mng_handle hMNG = mng_initialize( MNG_NULL, my_mng_alloc, my_mng_free, MNG_NULL );
	17	+ mng_handle hMNG =
	18	+ mng_initialize(MNG_NULL, my_mng_alloc, my_mng_free, MNG_NULL);
18	19	mng_cleanup(&hMNG);
19	20
20	21	return 0;
21	22