libetherpix

@@ -1,4 +1,4 @@

-# FlexiPix library

+# EtherPix library

 #

 # Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>

 #

@@ -15,7 +15,7 @@

 # You should have received a copy of the GNU Lesser General Public License

 # along with this program. If not, see <http://www.gnu.org/licenses/>.

-LIBTARGET := libflexipix

+LIBTARGET := libetherpix

 VER_MAJ   := 1

 VER_MIN   := 1

 VER_REV   := 0

@@ -25,13 +25,13 @@ SRCS    := $(wildcard src/*.c)

 EX_SRCS := $(wildcard examples/src/*.c)

 CFLAGS     := -Wall -Wextra -Werror -O3

-DEFINES    := -DFLP_VER_MAJ=$(VER_MAJ) -DFLP_VER_MIN=$(VER_MIN) \

-              -DFLP_VER_REV=$(VER_REV)

+DEFINES    := -DETP_VER_MAJ=$(VER_MAJ) -DETP_VER_MIN=$(VER_MIN) \

+              -DETP_VER_REV=$(VER_REV)

 INCLUDES   := -Iinclude

 SH_LDFLAGS :=

 SH_LIBS    :=

 EX_LDFLAGS := -Llib

-EX_LIBS    := -lflexipix -lm

+EX_LIBS    := -letherpix -lm

 STOW_DIR   := /usr/local/stow

 DEF_PREFIX := /usr/local

@@ -96,7 +96,7 @@ TARGET    := lib/$(LIBTARGET).a

 SH_TARGET := lib/$(LIBTARGET).$(LEXT)$(LEXTSUF)

 ENV_PREFIX := $(shell echo $$PREFIX)

-STOW_PREFIX := $(STOW_DIR)/libflexipix-$(VERSION)

+STOW_PREFIX := $(STOW_DIR)/libetherpix-$(VERSION)

 ifneq ($(ENV_PREFIX),)

   PREFIX := $(ENV_PREFIX)

 else

@@ -157,8 +157,8 @@ clean:

 	       $(EX_DEPS) $(EX_OBJS) $(EX_TARGETS)

 install: all

-	$(INSTALL) -d $(PREFIX)/include/flexipix

-	$(INSTALL) -m 644 -t $(PREFIX)/include/flexipix $(wildcard include/flexipix/*.h)

+	$(INSTALL) -d $(PREFIX)/include/etherpix

+	$(INSTALL) -m 644 -t $(PREFIX)/include/etherpix $(wildcard include/etherpix/*.h)

 	$(INSTALL) -d $(PREFIX)/lib

 	$(INSTALL) -m 644 -t $(PREFIX)/lib $(TARGET) $(SH_TARGET)

 ifeq ($(OS),linux)

@@ -171,5 +171,5 @@ endif

 uninstall:

 	rm -f $(PREFIX)/lib/$(notdir $(SH_TARGET))

 	rm -f $(PREFIX)/lib/$(notdir $(TARGET))

-	rm -rf $(PREFIX)/include/flexipix

+	rm -rf $(PREFIX)/include/etherpix

@@ -1,4 +1,4 @@

-FlexiPix library

+EtherPix library

 FlexPix is a large scale display architecure that is driven using UDP/IP.

 It consists of single pixels that are connected to chains. A number of those

@@ -7,7 +7,7 @@ receives data over ethernet and distributes it to the pixel chains.

 The protocol used on UDP is MCUF (microcontroller unit frame, see

 http://wiki.blinkenarea.org/index.php/MicroControllerUnitFrame). However,

-as FlexiPix displays can have more than 65536 pixels, multiple MCUF packets

+as EtherPix displays can have more than 65536 pixels, multiple MCUF packets

 are sent for one frame - a single MCUF frame to every distributor.

 The coordinates of the pixels in the MCUF packets do not correspond to pixel

 locations, but to pixel addresses. The y coordinate is the number of the

@@ -15,7 +15,7 @@ output of the distributor and the x coordinate is the number of the pixel

 in the chain. The number of channels is always 3 (RGB) and the maximum value

 is always 255 (8 bit per channel).

-This library can be used to send the required UDP packets to the FlexiPix

+This library can be used to send the required UDP packets to the EtherPix

 display to make it show images and/or videos.

 As the libarary has to know how the pixels are wired and where there are

 located (i.e. which pixel in the source image they represent), a rather

@@ -1,8 +1,8 @@

-# FlexiPix config file generator

+# EtherPix config file generator

 #

 # Copyright 2010-2017 Stefan Schuermans <stefan schuermans info>

-TARGET := flexipix_config_gen

+TARGET := etherpix_config_gen

 VER := 1

 VERMIN := 1

 VERREV := 0

@@ -13,8 +13,8 @@ CPP := g++

 INSTALL := install

 CFLAGS := -W -Wall -O3

-DEFINES := -DFLPCG_VER_MAJ=$(VER) -DFLPCG_VER_MIN=$(VERMIN) \

-           -DFLPCG_VER_REV=$(VERREV)

+DEFINES := -DETPCG_VER_MAJ=$(VER) -DETPCG_VER_MIN=$(VERMIN) \

+           -DETPCG_VER_REV=$(VERREV)

 INCLUDES :=

 LDFLAGS :=

 LIBS := -ldime -lm

@@ -28,7 +28,7 @@ VERSION := $(VER).$(VERMIN).$(VERREV)

 ENV_PREFIX := $(shell echo $$PREFIX)

 STOW_DIR := /usr/local/stow

-STOW_PREFIX := $(STOW_DIR)/flpConfigGen-$(VERSION)

+STOW_PREFIX := $(STOW_DIR)/etpConfigGen-$(VERSION)

 DEF_PREFIX := /usr/local

 ifneq ($(ENV_PREFIX),)

   PREFIX := $(ENV_PREFIX)

@@ -1,4 +1,4 @@

-The tool flexipix_config_gen creates the major part of a flexipix config file

+The tool etherpix_config_gen creates the major part of a etherpix config file

 from a drawing of the display in DXF format.

 See for example "examples/5x2panels8x12.dxf".

@@ -1 +1 @@

-/*.flp

+/*.etp

@@ -1,8 +1,8 @@

 DRAWINGS := $(wildcard *.dxf)

-CONFIGS := $(DRAWINGS:.dxf=.flp)

+CONFIGS := $(DRAWINGS:.dxf=.etp)

-CFGGEN := ../src/flexipix_config_gen

+CFGGEN := ../src/etherpix_config_gen

 .PHONY: all clean

 .SUFFIXES:

@@ -10,7 +10,7 @@ CFGGEN := ../src/flexipix_config_gen

 all: $(CONFIGS)

-%.flp: %.dxf $(CFGGEN)

+%.etp: %.dxf $(CFGGEN)

 	$(CFGGEN) $< $@

 clean:

@@ -1,3 +1,3 @@

 /*.d

 /*.o

-/flexipix_config_gen

+/etherpix_config_gen

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010-2017 Stefan Schuermans <stefan schuermans info>

  *

@@ -398,11 +398,11 @@ int main(int argc, char *argv[])

 {

   // get parameters

   if (argc != 3) {

-    std::cerr << "FlexiPix config file generator "

-              << FLPCG_VER_MAJ << "."

-              << FLPCG_VER_MIN << "."

-              << FLPCG_VER_REV << std::endl

-              << "usage: " << argv[0] << " <schematic_drawing.dxf> <config.flp>"

+    std::cerr << "EtherPix config file generator "

+              << ETPCG_VER_MAJ << "."

+              << ETPCG_VER_MIN << "."

+              << ETPCG_VER_REV << std::endl

+              << "usage: " << argv[0] << " <schematic_drawing.dxf> <config.etp>"

               << std::endl;

     return -1;

   }

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,5 +1,5 @@

 /*

- * FlexiPix config file generator

+ * EtherPix config file generator

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,4 +1,4 @@

-# FlexiPix configuration file for screen with 2x2 panels of 8x12 pixels each

+# EtherPix configuration file for screen with 2x2 panels of 8x12 pixels each

 # address of local output socket

 # all distributors must be reachable from this address

@@ -1,4 +1,4 @@

-# FlexiPix configuration file for screen with 5x2 panels of 8x12 pixels each

+# EtherPix configuration file for screen with 5x2 panels of 8x12 pixels each

 # address of local output socket

 # all distributors must be reachable from this address

@@ -1,7 +1,7 @@

-# FlexiPix configuration file

+# EtherPix configuration file

 # the address to bind the local socket to

-#  - the FlexiPix network 10.70.80.0/16 must be reachable from this address

+#  - the EtherPix network 10.70.80.0/16 must be reachable from this address

 bindAddr = 0.0.0.0:0

 # the size of the display

@@ -1,7 +1,7 @@

-# FlexiPix configuration file

+# EtherPix configuration file

 # the address to bind the local socket to

-#  - the FlexiPix network 10.70.80.0/16 must be reachable from this address

+#  - the EtherPix network 10.70.80.0/16 must be reachable from this address

 bindAddr = 0.0.0.0:0

 # the size of the display

@@ -2,7 +2,7 @@

 #include <stdio.h>

 #include <unistd.h>

-#include <flexipix/flexipix.h>

+#include <etherpix/etherpix.h>

 #ifdef WINDOWS

 #include <winsock.h>

@@ -17,8 +17,8 @@ typedef struct userdata_s {

 /* callback function called during display creation,

    the p_ctx parameter is the userdata supplied in the call

-   to flp_display_create() */

-void msg(void *p_ctx, flp_msg_type_t type, const char *fmt, ...)

+   to etp_display_create() */

+void msg(void *p_ctx, etp_msg_type_t type, const char *fmt, ...)

 {

   userdata_t *p_userdata = (userdata_t *)p_ctx;

   va_list va;

@@ -29,13 +29,13 @@ void msg(void *p_ctx, flp_msg_type_t type, const char *fmt, ...)

   /* type tells if the message is an error, a warning or an information */

   switch (type) {

-    case flp_msg_type_err:

+    case etp_msg_type_err:

       printf("ERROR: ");

       break;

-    case flp_msg_type_warn:

+    case etp_msg_type_warn:

       printf("WARNING: ");

       break;

-    case flp_msg_type_info:

+    case etp_msg_type_info:

       printf("INFORMATION: ");

       break;

   }

@@ -51,12 +51,12 @@ int main(int argc, char *argv[])

 {

   const char *config;

   userdata_t userdata = { 42, 42.0, '!' }; /* just an example */

-  flp_display_t *p_display;

+  etp_display_t *p_display;

   unsigned int width, height, i;

-  flp_u8_t white[3] = { 255, 255, 255 };

+  etp_u8_t white[3] = { 255, 255, 255 };

   if (argc < 2) {

-    printf("usage: %s <config.flp>\n", argv[0]);

+    printf("usage: %s <config.etp>\n", argv[0]);

     return -1;

   }

   config = argv[1];

@@ -72,33 +72,33 @@ int main(int argc, char *argv[])

      deliver messages to the callback function msg(),

      the last parameter is passed as first parameter to msg()

      and can be used to supply some user defined data */

-  p_display = flp_display_create(config, msg, (void *)&userdata);

+  p_display = etp_display_create(config, msg, (void *)&userdata);

   if (!p_display) {

     printf("could not create display\n");

     return -1;

   }

-  flp_display_get_size(p_display, &width, &height);

+  etp_display_get_size(p_display, &width, &height);

   printf("width:  %5u\nheight: %5u\n", width, height);

   printf("blink\n");

   for (i = 0; i < 5; ++i) {

     printf("on\n");

-    flp_display_data_fmt(p_display, white, 0, 0, 0, 0, width, height,

-                         flp_pixfmt_rgb24);

-    flp_display_send(p_display);

+    etp_display_data_fmt(p_display, white, 0, 0, 0, 0, width, height,

+                         etp_pixfmt_rgb24);

+    etp_display_send(p_display);

     usleep(100000);

     printf("off\n");

-    flp_display_data_clear(p_display);

-    flp_display_send(p_display);

+    etp_display_data_clear(p_display);

+    etp_display_send(p_display);

     usleep(500000);

   } /* for (i ...) */

   printf("done\n");

-  flp_display_free(p_display);

+  etp_display_free(p_display);

 #ifdef WINDOWS

   WSACleanup();

@@ -2,7 +2,7 @@

 #include <stdio.h>

 #include <stdlib.h>

-#include <flexipix/flexipix.h>

+#include <etherpix/etherpix.h>

 #ifdef WINDOWS

 #include <winsock.h>

@@ -17,8 +17,8 @@ typedef struct userdata_s {

 /* callback function called during display creation,

    the p_ctx parameter is the userdata supplied in the call

-   to flp_display_create() */

-void msg(void *p_ctx, flp_msg_type_t type, const char *fmt, ...)

+   to etp_display_create() */

+void msg(void *p_ctx, etp_msg_type_t type, const char *fmt, ...)

 {

   userdata_t *p_userdata = (userdata_t *)p_ctx;

   va_list va;

@@ -29,13 +29,13 @@ void msg(void *p_ctx, flp_msg_type_t type, const char *fmt, ...)

   /* type tells if the message is an error, a warning or an information */

   switch (type) {

-    case flp_msg_type_err:

+    case etp_msg_type_err:

       printf("ERROR: ");

       break;

-    case flp_msg_type_warn:

+    case etp_msg_type_warn:

       printf("WARNING: ");

       break;

-    case flp_msg_type_info:

+    case etp_msg_type_info:

       printf("INFORMATION: ");

       break;

   }

@@ -51,13 +51,13 @@ int main(int argc, char *argv[])

 {

   const char *config;

   userdata_t userdata = { 42, 42.0, '!' }; /* just an example */

-  flp_displayer_t *p_displayer;

+  etp_displayer_t *p_displayer;

   unsigned int width, height, i, j, c, x, y;

-  flp_u8_t *p_image;

+  etp_u8_t *p_image;

   char line[64];

   if (argc < 2) {

-    printf("usage: %s <config.flp>\n", argv[0]);

+    printf("usage: %s <config.etp>\n", argv[0]);

     return -1;

   }

   config = argv[1];

@@ -76,25 +76,25 @@ int main(int argc, char *argv[])

      deliver messages to the callback function msg(),

      the last parameter is passed as first parameter to msg()

      and can be used to supply some user defined data */

-  p_displayer = flp_displayer_create(config, msg, (void *)&userdata);

+  p_displayer = etp_displayer_create(config, msg, (void *)&userdata);

   if (!p_displayer) {

     printf("could not create displayer\n");

     return -1;

   }

-  flp_displayer_get_size(p_displayer, &width, &height);

+  etp_displayer_get_size(p_displayer, &width, &height);

   printf("width:  %5u\nheight: %5u\n", width, height);

   /* create a buffer for the image */

-  p_image = (flp_u8_t *)malloc(height * width * 3);

+  p_image = (etp_u8_t *)malloc(height * width * 3);

   if (!p_image) {

-    flp_displayer_free(p_displayer);

+    etp_displayer_free(p_displayer);

     printf("out of memory\n");

     return -1;

   }

   /* make displayer start sending data to distributors */

-  flp_displayer_activate(p_displayer);

+  etp_displayer_activate(p_displayer);

   /* The following loop will spent most waiting for user input.

      While it is waiting, the displayer will periodically sent

@@ -126,17 +126,17 @@ int main(int argc, char *argv[])

     }

     /* set new image */

-    flp_displayer_data_fmt(p_displayer, p_image,

+    etp_displayer_data_fmt(p_displayer, p_image,

                            3, /* consecutive pixels are 3 bytes apart */

                            width*3, /* consecutive lines width*3 bytes apart */

-                           0, 0, width, height, flp_pixfmt_rgb24);

+                           0, 0, width, height, etp_pixfmt_rgb24);

     /* force sending data to distris immediately */

-    flp_displayer_send(p_displayer);

+    etp_displayer_send(p_displayer);

   } /* while (1) */

   free(p_image);

-  flp_displayer_free(p_displayer);

+  etp_displayer_free(p_displayer);

 #ifdef WINDOWS

   WSACleanup();

@@ -2,7 +2,7 @@

 #include <stdio.h>

 #include <stdlib.h>

-#include <flexipix/flexipix.h>

+#include <etherpix/etherpix.h>

 #ifdef WINDOWS

 #include <winsock.h>

@@ -17,8 +17,8 @@ typedef struct userdata_s {

 /* callback function called during display creation,

    the p_ctx parameter is the userdata supplied in the call

-   to flp_display_create() */

-void msg(void *p_ctx, flp_msg_type_t type, const char *fmt, ...)

+   to etp_display_create() */

+void msg(void *p_ctx, etp_msg_type_t type, const char *fmt, ...)

 {

   userdata_t *p_userdata = (userdata_t *)p_ctx;

   va_list va;

@@ -29,13 +29,13 @@ void msg(void *p_ctx, flp_msg_type_t type, const char *fmt, ...)

   /* type tells if the message is an error, a warning or an information */

   switch (type) {

-    case flp_msg_type_err:

+    case etp_msg_type_err:

       printf("ERROR: ");

       break;

-    case flp_msg_type_warn:

+    case etp_msg_type_warn:

       printf("WARNING: ");

       break;

-    case flp_msg_type_info:

+    case etp_msg_type_info:

       printf("INFORMATION: ");

       break;

   }

@@ -51,12 +51,12 @@ int main(int argc, char *argv[])

 {

   const char *config;

   userdata_t userdata = { 42, 42.0, '!' }; /* just an example */

-  flp_display_t *p_display;

+  etp_display_t *p_display;

   unsigned int width, height, i, x, y;

-  flp_u8_t *p_image;

+  etp_u8_t *p_image;

   if (argc < 2) {

-    printf("usage: %s <config.flp>\n", argv[0]);

+    printf("usage: %s <config.etp>\n", argv[0]);

     return -1;

   }

   config = argv[1];

@@ -72,42 +72,42 @@ int main(int argc, char *argv[])

      deliver messages to the callback function msg(),

      the last parameter is passed as first parameter to msg()

      and can be used to supply some user defined data */

-  p_display = flp_display_create(config, msg, (void *)&userdata);

+  p_display = etp_display_create(config, msg, (void *)&userdata);

   if (!p_display) {

     printf("could not create display\n");

     return -1;

   }

-  flp_display_get_size(p_display, &width, &height);

+  etp_display_get_size(p_display, &width, &height);

   printf("width:  %5u\nheight: %5u\n", width, height);

   /* create an image with a nice fade:

      black to red from left to right,

      black to green from top to bottom */

-  p_image = (flp_u8_t *)malloc(height * width * 3);

+  p_image = (etp_u8_t *)malloc(height * width * 3);

   if (!p_image) {

-    flp_display_free(p_display);

+    etp_display_free(p_display);

     printf("out of memory\n");

     return -1;

   }

   i = 0;

   for (y = 0; y < height; ++y) {

     for (x = 0; x < width; ++x) {

-      p_image[i++] = (flp_u8_t)(255.0*x/(width-1)+0.5); /* red */

-      p_image[i++] = (flp_u8_t)(255.0*y/(height-1)+0.5); /* green */

+      p_image[i++] = (etp_u8_t)(255.0*x/(width-1)+0.5); /* red */

+      p_image[i++] = (etp_u8_t)(255.0*y/(height-1)+0.5); /* green */

       p_image[i++] = 0; /* no blue */

     }

   }

   /* output image */

-  flp_display_data_fmt(p_display, p_image,

+  etp_display_data_fmt(p_display, p_image,

                        3, /* consecutive pixels are 3 bytes apart */

                        width*3, /* consecutive lines are width*3 bytes apart */

-                       0, 0, width, height, flp_pixfmt_rgb24);

-  flp_display_send(p_display);

+                       0, 0, width, height, etp_pixfmt_rgb24);

+  etp_display_send(p_display);

   free(p_image);

-  flp_display_free(p_display);

+  etp_display_free(p_display);

 #ifdef WINDOWS

   WSACleanup();

@@ -1 +1 @@

-http://git.blinkenarea.org/projects/libflexipix

+http://git.blinkenarea.org/projects/libetherpix

@@ -1 +1 @@

-http://git.blinkenarea.org/index.php?p=libflexipix

+http://git.blinkenarea.org/index.php?p=libetherpix

@@ -1,5 +1,5 @@

 /*

- * FlexiPix library

+ * EtherPix library

  *

  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>

  *

@@ -17,61 +17,61 @@

  * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */

-#ifndef FLP_INC_DISPLAY_H

-#define FLP_INC_DISPLAY_H

+#ifndef ETP_INC_DISPLAY_H

+#define ETP_INC_DISPLAY_H

-#include <flexipix/msg.h>

-#include <flexipix/types.h>

+#include <etherpix/msg.h>

+#include <etherpix/types.h>

 /**

- * \brief create a new FlexiPix display

+ * \brief create a new EtherPix display

  *

  * \param[in] sz_config_file name of config file to read

  * \param[in] p_msg_func message callback function or NULL

  * \param[in] p_msg_ctx user context for message callback

- * \return pointer to new FlexiPix display on success

+ * \return pointer to new EtherPix display on success

  *         or NULL on error

  */

-flp_display_t *flp_display_create(const char *sz_config_file,

-                                  flp_msg_func_p_t p_msg_func,

+etp_display_t *etp_display_create(const char *sz_config_file,

+                                  etp_msg_func_p_t p_msg_func,

                                   void *p_msg_ctx);

 /**

- * \brief free a FlexiPix display

+ * \brief free a EtherPix display

  *

- * \param[in] p_display pointer to FlexiPix display

+ * \param[in] p_display pointer to EtherPix display

  */

-void flp_display_free(flp_display_t *p_display);

+void etp_display_free(etp_display_t *p_display);

 /**

  * \brief get size of display

  *

- * \param[in] p_display pointer to FlexiPix display

+ * \param[in] p_display pointer to EtherPix display

  * \param[out] p_width width of display

  * \param[out] p_height height of display

  */

-void flp_display_get_size(flp_display_t *p_display,

+void etp_display_get_size(etp_display_t *p_display,

                           unsigned int *p_width, unsigned int *p_height);

 /**

- * \brief clear image data to output on FlexiPix display

+ * \brief clear image data to output on EtherPix display

  *

  * clears the stored image data,

  * stored image data can later be sent to the distributors using

- * flp_display_send()

+ * etp_display_send()

  *

- * \param[in] p_display pointer to FlexiPix display

+ * \param[in] p_display pointer to EtherPix display

  */

-void flp_display_data_clear(flp_display_t *p_display);

+void etp_display_data_clear(etp_display_t *p_display);

 /**

- * \brief set image data to output on FlexiPix display

+ * \brief set image data to output on EtherPix display

  *

  * updates (part of) the stored image data,

  * stored image data can later be sent to the distributors using

- * flp_display_send()

+ * etp_display_send()

  *

- * \param[in] p_display pointer to FlexiPix display

+ * \param[in] p_display pointer to EtherPix display

  * \param[in] p_data pointer to rectangular section of image data

  * \param[in] stride_x stride between two pixels in X direction

  * \param[in] stride_y stride between two pixels in Y direction

@@ -81,19 +81,19 @@ void flp_display_data_clear(flp_display_t *p_display);

  * \param[in] height height of rectangular area

  * \param[in] pixfmt format of pixel data

  */

-void flp_display_data_fmt(flp_display_t *p_display, flp_u8_t *p_data,

+void etp_display_data_fmt(etp_display_t *p_display, etp_u8_t *p_data,

                           int stride_x, int stride_y,

                           unsigned int x, unsigned int y,

                           unsigned int width, unsigned int height,

-                          flp_pixfmt_t pixfmt);

+                          etp_pixfmt_t pixfmt);

 /**

- * \brief set image data to output on FlexiPix display

+ * \brief set image data to output on EtherPix display

  *

- * see flp_display_data_fmt for documentation

- * pixfmt is fixed to flp_pixfmt_rgb24

+ * see etp_display_data_fmt for documentation

+ * pixfmt is fixed to etp_pixfmt_rgb24

  */

-void flp_display_data(flp_display_t *p_display, flp_u8_t *p_data,

+void etp_display_data(etp_display_t *p_display, etp_u8_t *p_data,

                       int stride_x, int stride_y,

                       unsigned int x, unsigned int y,

                       unsigned int width, unsigned int height);

@@ -103,9 +103,9 @@ void flp_display_data(flp_display_t *p_display, flp_u8_t *p_data,

  *

  * sends the currently stored image data to all configured distributors

  *

- * \param[in] p_display pointer to FlexiPix display

+ * \param[in] p_display pointer to EtherPix display

  */

-void flp_display_send(flp_display_t *p_display);

+void etp_display_send(etp_display_t *p_display);

-#endif /* #ifndef FLP_INC_DISPLAY_H */

+#endif /* #ifndef ETP_INC_DISPLAY_H */

@@ -1,5 +1,5 @@

 /*

- * FlexiPix library

+ * EtherPix library

  *

  * Copyright 2010-2011 Stefan Schuermans <stefan schuermans info>

  *

@@ -17,47 +17,47 @@

  * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */

-#ifndef FLP_INC_DISPLAYER_H

-#define FLP_INC_DISPLAYER_H

+#ifndef ETP_INC_DISPLAYER_H

+#define ETP_INC_DISPLAYER_H

-#include <flexipix/msg.h>

-#include <flexipix/types.h>

+#include <etherpix/msg.h>

+#include <etherpix/types.h>

 /**

- * \brief create a new FlexiPix displayer

+ * \brief create a new EtherPix displayer

  *

  * A displayer manages a display and ensures that a the current

  * image data is sent often enough to the distributors so

  * that the pixels do detect a timeout and turn off automatically.

  * The displayer uses a thread to do this.

  * Initially, the new displayer is inactive and has to be activated

- * using flp_displayer_activate().

+ * using etp_displayer_activate().

  *

  * \param[in] sz_config_file name of config file to read

  * \param[in] p_msg_func message callback function or NULL

  * \param[in] p_msg_ctx user context for message callback

- * \return pointer to new FlexiPix displayer on success

+ * \return pointer to new EtherPix displayer on success

  *         or NULL on error

  */

-flp_displayer_t *flp_displayer_create(const char *sz_config_file,

-                                      flp_msg_func_p_t p_msg_func,

+etp_displayer_t *etp_displayer_create(const char *sz_config_file,

+                                      etp_msg_func_p_t p_msg_func,

                                       void *p_msg_ctx);

 /**

- * \brief free a FlexiPix displayer

+ * \brief free a EtherPix displayer

  *

- * \param[in] p_displayer pointer to FlexiPix displayer

+ * \param[in] p_displayer pointer to EtherPix displayer

  */

-void flp_displayer_free(flp_displayer_t *p_displayer);

+void etp_displayer_free(etp_displayer_t *p_displayer);

 /**

  * \brief get size of display managed by displayer

  *

- * \param[in] p_displayer pointer to FlexiPix displayer

+ * \param[in] p_displayer pointer to EtherPix displayer

  * \param[out] p_width width of display

  * \param[out] p_height height of display

  */

-void flp_displayer_get_size(flp_displayer_t *p_displayer,

+void etp_displayer_get_size(etp_displayer_t *p_displayer,

                             unsigned int *p_width, unsigned int *p_height);

 /**

@@ -68,9 +68,9 @@ void flp_displayer_get_size(flp_displayer_t *p_displayer,

  * this function might trigger sending of data if the last

  * sending time was too long ago

  *

- * \param[in] p_displayer pointer to FlexiPix displayer

+ * \param[in] p_displayer pointer to EtherPix displayer

  */

-void flp_displayer_activate(flp_displayer_t *p_displayer);

+void etp_displayer_activate(etp_displayer_t *p_displayer);

 /**

  * \brief deactivate the displayer

@@ -78,25 +78,25 @@ void flp_displayer_activate(flp_displayer_t *p_displayer);

  * set the displayer to deactive, i.e. prevent it from sening image

  * data to the distributors automatically,

  *

- * \param[in] p_displayer pointer to FlexiPix displayer

+ * \param[in] p_displayer pointer to EtherPix displayer

  */

-void flp_displayer_deactivate(flp_displayer_t *p_displayer);

+void etp_displayer_deactivate(etp_displayer_t *p_displayer);

 /**

- * \brief clear image data to output on FlexiPix displayer

+ * \brief clear image data to output on EtherPix displayer

  *

  * clears the stored image data

  *

- * \param[in] p_displayer pointer to FlexiPix displayer

+ * \param[in] p_displayer pointer to EtherPix displayer

  */

-void flp_displayer_data_clear(flp_displayer_t *p_displayer);

+void etp_displayer_data_clear(etp_displayer_t *p_displayer);

 /**

- * \brief set image data to output on FlexiPix display

+ * \brief set image data to output on EtherPix display

  *

  * updates (part of) the stored image data

  *

- * \param[in] p_displayer pointer to FlexiPix displayer

+ * \param[in] p_displayer pointer to EtherPix displayer

  * \param[in] p_data pointer to rectangular section of image data

  * \param[in] stride_x stride between two pixels in X direction

  * \param[in] stride_y stride between two pixels in Y direction

@@ -106,19 +106,19 @@ void flp_displayer_data_clear(flp_displayer_t *p_displayer);

  * \param[in] height height of rectangular area

  * \param[in] pixfmt format of pixel data

  */

-void flp_displayer_data_fmt(flp_displayer_t *p_displayer, flp_u8_t *p_data,

+void etp_displayer_data_fmt(etp_displayer_t *p_displayer, etp_u8_t *p_data,

                             int stride_x, int stride_y,

                             unsigned int x, unsigned int y,

                             unsigned int width, unsigned int height,

-                            flp_pixfmt_t pixfmt);

+                            etp_pixfmt_t pixfmt);

 /**

- * \brief set image data to output on FlexiPix display

+ * \brief set image data to output on EtherPix display

  *

- * see flp_displayer_data_fmt for documentation

- * pixfmt is fixed to flp_pixfmt_rgb24

+ * see etp_displayer_data_fmt for documentation

+ * pixfmt is fixed to etp_pixfmt_rgb24

  */

-void flp_displayer_data(flp_displayer_t *p_displayer, flp_u8_t *p_data,

+void etp_displayer_data(etp_displayer_t *p_displayer, etp_u8_t *p_data,

                         int stride_x, int stride_y,

                         unsigned int x, unsigned int y,

                         unsigned int width, unsigned int height);

@@ -128,9 +128,9 @@ void flp_displayer_data(flp_displayer_t *p_displayer, flp_u8_t *p_data,

  *

  * this only works if the displayer is active

  *

- * \param[in] p_displayer pointer to FlexiPix displayer

+ * \param[in] p_displayer pointer to EtherPix displayer

  */

-void flp_displayer_send(flp_displayer_t *p_displayer);