diff options
100 files changed, 433 insertions, 429 deletions
@@ -4,8 +4,8 @@ .*.swp .directory -src/crc-bridgetest -src/crc-dabmux +src/odr-bridgetest +src/odr-dabmux src/dabOutput/.deps/ src/dabOutput/.dirstamp @@ -28,4 +28,3 @@ cscope.out ctags tags .clang_complete -.ycm_extra_conf.py* @@ -1,5 +1,11 @@ This file contains information about the changes done to -the CRC-DabMux in this repository +the ODR-DabMux in this repository + +2014-02-07: Matthias P. Braendli <matthias@mpb.li> + (v0.4.0) + * crc-dabmux: + CRC-DabMux renamed to ODR-DabMux + Version bump to 0.4.0 2014-01-31: Matthias P. Braendli <matthias@mpb.li> (tag r12): @@ -90,17 +96,17 @@ Copyright (C) 2010,2011 Her Majesty the Queen in Right of Canada Copyright (C) 2013,2014 Matthias P. Braendli, http://mpb.li -This file is part of CRC-DabMux. +This file is part of ODR-DabMux. -CRC-DabMux is free software: you can redistribute it and/or modify +ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -CRC-DabMux is distributed in the hope that it will be useful, +ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. +along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. @@ -17,12 +17,12 @@ Simple install procedure using tarball release: [as root] % make install # Install the library - % tar xjf crc-dabmux-0.3.0.4.tar.bz2 # Unpack the source - % cd crc-dabmux-0.3.0.4 # Change to the source directory + % tar xjf odr-dabmux-x.y.z.tar.bz2 # Unpack the source + % cd odr-dabmux-x.y.z # Change to the source directory % ./configure # Run the configure script - % make # Build CRC-DabMux + % make # Build ODR-DabMux [ as root ] - % make install # Install CRC-DabMux + % make install # Install ODR-DabMux Nearly as simple install procedure using repository: ==================================================== diff --git a/Makefile.am b/Makefile.am index d495b79..6e9e392 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,20 +1,20 @@ # Copyright (C) 2008, 2009 Her Majesty the Queen in Right of Canada # (Communications Research Center Canada) -# This file is part of CRC-DabMux. +# This file is part of ODR-DabMux. # -# CRC-DabMux is free software: you can redistribute it and/or modify +# ODR-DabMux is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as # published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # -# CRC-DabMux is distributed in the hope that it will be useful, +# ODR-DabMux is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. +# along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. SUBDIRS =src lib @@ -6,44 +6,44 @@ the Queen in Right of Canada (Communications Research Center Canada) Copyright (C) 2013, 2014 Matthias P. Braendli, http://mpb.li -This file is part of CRC-DabMux. +This file is part of ODR-DabMux. -CRC-DabMux is free software: you can redistribute it and/or modify +ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -CRC-DabMux is distributed in the hope that it will be useful, +ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. +along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. OVERVIEW ======== -This is CRC-DabMux 0.3.0.4-mpb +This is ODR-DabMux 0.4.0 -CRC-DabMux is a DAB (Digital Audio Broadcasting) multiplexer compliant to +ODR-DabMux is a DAB (Digital Audio Broadcasting) multiplexer compliant to ETSI EN 300 401. This version has been modified, and contains additional features compared to the official one: - configuration file support, see doc/example.mux - timestamping support required for SFN -- a ZeroMQ ETI output that can be used with CRC-DABMOD +- a ZeroMQ ETI output that can be used with ODR-DABMOD - a ZeroMQ dabplus input that can be used with fdk-aac-dabplus-zmq - supports logging to syslog - supports ZMQ input monitoring with munin tool - supports a Telnet Remote Control for setting/getting parameters (this is, for now, not used yet) -The src/ directory contains the source code of CRC-DabMux. +The src/ directory contains the source code of ODR-DabMux. -The doc/ directory contains the CRC-DabMux documentation. +The doc/ directory contains the ODR-DabMux documentation. -The lib/ directory contains source code of libraries need to build CRC-DabMux. +The lib/ directory contains source code of libraries need to build ODR-DabMux. INSTALL ======= @@ -54,7 +54,6 @@ CONTACT Pascal Charest <pascal [dot] charest [at] crc [dot] ca> Matthias P. Braendli <matthias [at] mpb [dot] li> -http://mmbtools.crc.ca/ -http://www.crc.ca/mmb -http://openmokast.org/ +http://opendigitalradio.org/ http://mpb.li/ +http://mmbtools.crc.ca/ diff --git a/configure.ac b/configure.ac index 3ae8505..e7b7be7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,23 +1,23 @@ # Copyright (C) 2008, 2009 Her Majesty the Queen in Right of Canada # (Communications Research Center Canada) -# This file is part of CRC-DabMux. +# This file is part of ODR-DabMux. # -# CRC-DabMux is free software: you can redistribute it and/or modify +# ODR-DabMux is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as # published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # -# CRC-DabMux is distributed in the hope that it will be useful, +# ODR-DabMux is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. +# along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ(2.61) -AC_INIT([CRC-DabMux], [0.3.0.4-mpb], [pascal.charest@crc.ca]) +AC_INIT([ODR-DabMux], [0.4.0], [matthias.braendli@mpb.li]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE([-Wall subdir-objects]) diff --git a/doc/DabMux.1 b/doc/DabMux.1 index 396ff1c..3ec87e4 100644 --- a/doc/DabMux.1 +++ b/doc/DabMux.1 @@ -2,19 +2,19 @@ .\" groff -t -man -Tascii DabMux.1 .\" groff -t -man DabMux.1 > DabMux.ps .\" -.TH CRC-DABMUX 1 "2006-2014" "\(co Communications Research Centre Canada and Matthias P. Braendli" "User Manual" +.TH ODR-DabMux 1 "2006-2014" "\(co Communications Research Centre Canada and Matthias P. Braendli" "User Manual" .SH NAME -crc-dabmux \- A software DAB multiplexer +odr-dabmux \- A software DAB multiplexer .SH SYNOPSIS -crc-dabmux can be used in two ways: either with command line options, or with an external configuration file. +odr-dabmux can be used in two ways: either with command line options, or with an external configuration file. It is not possible to use both simultaneously. .SS External Configuration File: -.B crc-dabmux -e config-file.mux +.B odr-dabmux -e config-file.mux An example configuration file with explanations is located in doc/ .SS Configuration Through Command-Line Arguments: -.B crc-dabmux +.B odr-dabmux .BI [ ensemble ] .BI [ "subchannel1 subchannel2 ..." ] .BI [ "service1 component1 " [ "component2 ..." ] " service2 ..."] @@ -60,7 +60,7 @@ An example configuration file with explanations is located in doc/ .BI -O " outputName" .SH DESCRIPTION -CRC-DABMUX is a software multiplexer that generates an ETI stream from audio and data streams. Because of its software based architecture, many typical DAB services can be generated and multiplexed on a single PC platform with live or pre-recorded sources. +ODR-DabMux is a software multiplexer that generates an ETI stream from audio and data streams. Because of its software based architecture, many typical DAB services can be generated and multiplexed on a single PC platform with live or pre-recorded sources. A DAB multiplex configuration is composed of one ensemble. An ensemble is the entity that receivers tune to and process. An ensemble contains several services. A service is the listener-selectable output. Each service contains one mandatory service component which is called primary component. An audio primary component define a program service while a data primary component define a data service. Service can contain additional components which are called secondary components. Maximum total number of components is 12 for program services and 11 for data services. A service component is a link to one subchannel (or Fast Information Data Channel). A subchannel is the physical space used within the common interleaved frame. @@ -70,12 +70,12 @@ A DAB multiplex configuration is composed of one ensemble. An ensemble is the en .ps -1 .nf __________________________________________________ - | CRC-Ensemble | ENSEMBLE + | ODR-Ensemble | ENSEMBLE |__________________________________________________| | | | | | | _______V______ _______V______ _______V______ - | CRC-Service1 | | CRC-Service2 | | CRC-Service3 | SERVICES + | ODR-Service1 | | ODR-Service2 | | ODR-Service3 | SERVICES |______________| |______________| |______________| | | | | |______ | | | | | | | @@ -198,7 +198,7 @@ set non-blocking file input (audio and packet only) . .TP .BI -L " label" -label of service <n> (default: CRC-Audio<n>) +label of service <n> (default: ODR-Audio<n>) . .TP .BI -l " sLabel" @@ -478,7 +478,7 @@ Example: This scheme is an simulation output. Drop the stream and add a 24 ms delay between each write operation. .SS LOGS -Output logs can be sent to syslog, to facility LOCAL0 with identificator CRC-DABMUX. Use +Output logs can be sent to syslog, to facility LOCAL0 with identificator ODR-DabMux. Use .RB ( -o ) to turn the logging to syslog on. Priority codes can be found in the following table. .TS @@ -544,25 +544,25 @@ crc-dabmux \\ .br .M udp://224.8.8.8:1234 -b 256 -i 4 -p 4 \\ .br --S -L CRC-Karaoke -l 4064 -i 80 \\ +-S -L ODR-Karaoke -l 4064 -i 80 \\ .RS -C -i 0 \\ .br -C -i 2 \\ .RE --S -L "CRC-IP Tunneling" -l 4080 -i 81 \\ +-S -L "ODR-IP Tunneling" -l 4080 -i 81 \\ .RS -C -i 1 \\ .RE --S -L CRC-WebSite -l 0x0fe0 -i 82 \\ +-S -L ODR-WebSite -l 0x0fe0 -i 82 \\ .RS -C -i 2 \\ .RE --S -L "CRC-Slide Show" -l SlideShow -i 83 \\ +-S -L "ODR-Slide Show" -l SlideShow -i 83 \\ .RS -C -i 3 \\ .RE --S -L CRC-DMB -l 07000 -i 84 \\ +-S -L ODR-DMB -l 07000 -i 84 \\ .RS -C -i 4 \\ .RE diff --git a/doc/stats_dabmux_multi.py b/doc/stats_dabmux_multi.py index 2a51a2c..4501dcc 100755 --- a/doc/stats_dabmux_multi.py +++ b/doc/stats_dabmux_multi.py @@ -62,7 +62,7 @@ def connect(): version = json.loads(sock.recv(256)) - if not version['service'].startswith("CRC-DabMux"): + if not version['service'].startswith("ODR-DabMux"): sys.stderr.write("Wrong version\n") sys.exit(1) diff --git a/lib/Makefile.am b/lib/Makefile.am index d2bb342..b2d64be 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,19 +1,19 @@ # Copyright (C) 2009 Her Majesty the Queen in Right of Canada (Communications # Research Center Canada) -# This file is part of CRC-DabMux. +# This file is part of ODR-DabMux. # -# CRC-DabMux is free software: you can redistribute it and/or modify +# ODR-DabMux is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as # published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # -# CRC-DabMux is distributed in the hope that it will be useful, +# ODR-DabMux is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. +# along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. SUBDIRS =farsync diff --git a/src/DabMux.cpp b/src/DabMux.cpp index 4e10287..2ef28c9 100644 --- a/src/DabMux.cpp +++ b/src/DabMux.cpp @@ -7,20 +7,20 @@ 2012, Matthias P. Braendli, matthias.braendli@mpb.li */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H @@ -322,7 +322,7 @@ int main(int argc, char *argv[]) /* TODO: * In a SFN, when reconfiguring the ensemble, the multiplexer - * has to be restarted (crc-dabmux doesn't support reconfiguration). + * has to be restarted (odr-dabmux doesn't support reconfiguration). * Ideally, we must be able to restart transmission s.t. the receiver * synchronisation is preserved. */ @@ -373,7 +373,7 @@ int main(int argc, char *argv[]) } - etiLog.log(info, "CRC-DABMUX starting up"); + etiLog.log(info, "ODR-DabMux starting up"); if (outputs.size() == 0) { etiLog.log(emerg, "no output defined"); diff --git a/src/DabMux.h b/src/DabMux.h index 517e36b..8811771 100644 --- a/src/DabMux.h +++ b/src/DabMux.h @@ -10,20 +10,20 @@ and defines default values for some parameters. */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _DABMUX_H #define _DABMUX_H @@ -56,7 +56,7 @@ // Etiquettes des sous-canaux et de l'ensemble, 16 characteres incluant les // espaces -#define DEFAULT_ENSEMBLE_LABEL "CRC-Dr.Radio" +#define DEFAULT_ENSEMBLE_LABEL "ODR Dab Mux" #define DEFAULT_ENSEMBLE_SHORT_LABEL 0xe000 #define DEFAULT_ENSEMBLE_ID 0xc000 #define DEFAULT_ENSEMBLE_ECC 0xa1 diff --git a/src/Dmb.cpp b/src/Dmb.cpp index 95742d0..e168b63 100644 --- a/src/Dmb.cpp +++ b/src/Dmb.cpp @@ -3,20 +3,20 @@ of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "Dmb.h" @@ -3,20 +3,20 @@ of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _DMB diff --git a/src/Eti.cpp b/src/Eti.cpp index 74366e0..e1b51fb 100644 --- a/src/Eti.cpp +++ b/src/Eti.cpp @@ -6,20 +6,20 @@ 2012, Matthias P. Braendli, matthias.braendli@mpb.li */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifdef _WIN32 @@ -6,20 +6,20 @@ 2012, Matthias P. Braendli, matthias.braendli@mpb.li */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef ETI_ diff --git a/src/InetAddress.cpp b/src/InetAddress.cpp index 8915285..6d4b2b5 100644 --- a/src/InetAddress.cpp +++ b/src/InetAddress.cpp @@ -3,20 +3,20 @@ Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "InetAddress.h" diff --git a/src/InetAddress.h b/src/InetAddress.h index f818cbf..266b1fd 100644 --- a/src/InetAddress.h +++ b/src/InetAddress.h @@ -3,20 +3,20 @@ Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _InetAddress diff --git a/src/Interleaver.cpp b/src/Interleaver.cpp index 0b23b8d..7d69810 100644 --- a/src/Interleaver.cpp +++ b/src/Interleaver.cpp @@ -3,20 +3,20 @@ of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "Interleaver.h" diff --git a/src/Interleaver.h b/src/Interleaver.h index ad5cccf..3afe8f0 100644 --- a/src/Interleaver.h +++ b/src/Interleaver.h @@ -3,20 +3,20 @@ of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _INTERLEAVER @@ -6,20 +6,20 @@ Copyright (C), 2014, Matthias P. Braendli, matthias.braendli@mpb.li */ /* - This file is part of CRC-DADMOD. + This file is part of ODR-DabMux. - CRC-DADMOD is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DADMOD is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DADMOD. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _LOG_H @@ -40,7 +40,7 @@ #include <string> #include <map> -#define SYSLOG_IDENT "CRC-DABMUX" +#define SYSLOG_IDENT "ODR-DabMux" #define SYSLOG_FACILITY LOG_LOCAL0 enum log_level_t {debug = 0, info, warn, error, alert, emerg}; @@ -112,7 +112,7 @@ class LogToFile : public LogBackend { {"DEBUG", "INFO", "WARN", "ERROR", "ALERT", "EMERG"}; // fprintf is thread-safe - fprintf(log_file, "CRC-DABMUX: %s: %s\n", + fprintf(log_file, "ODR-DabMux: %s: %s\n", log_level_text[(size_t)level], message.c_str()); fflush(log_file); } diff --git a/src/Makefile.am b/src/Makefile.am index 3bcf54e..c5b40d4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,22 +5,22 @@ # Copyright (C) 2014, Matthias P. Braendli, http://mpb.li # -# This file is part of CRC-DabMux. +# This file is part of ODR-DabMux. # -# CRC-DabMux is free software: you can redistribute it and/or modify +# ODR-DabMux is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as # published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # -# CRC-DabMux is distributed in the hope that it will be useful, +# ODR-DabMux is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. +# along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. -bin_PROGRAMS=crc-dabmux crc-bridgetest +bin_PROGRAMS=odr-dabmux odr-bridgetest if IS_GIT_REPO GITVERSION_FLAGS = -DGITVERSION="\"-`git describe --long --tags`\"" @@ -37,9 +37,9 @@ else ZMQ_LIBS = endif -crc_dabmux_CPPFLAGS =-I$(FARSYNC_DIR) $(GITVERSION_FLAGS) -crc_dabmux_LDADD =$(FEC_LIBS) $(ZMQ_LIBS) -lpthread -lboost_thread -lboost_system -crc_dabmux_SOURCES =DabMux.cpp \ +odr_dabmux_CPPFLAGS =-I$(FARSYNC_DIR) $(GITVERSION_FLAGS) +odr_dabmux_LDADD =$(FEC_LIBS) $(ZMQ_LIBS) -lpthread -lboost_thread -lboost_system +odr_dabmux_SOURCES =DabMux.cpp \ dabInput.h dabInput.cpp \ dabInputBridgeUdp.h dabInputBridgeUdp.cpp \ dabInputDabplusFifo.h dabInputDabplusFifo.cpp \ @@ -90,7 +90,7 @@ crc_dabmux_SOURCES =DabMux.cpp \ TcpServer.h TcpServer.cpp \ TcpSocket.h TcpSocket.cpp -crc_bridgetest_CFLAGS =-DBRIDGE_TEST -crc_bridgetest_SOURCES =bridge.c \ +odr_bridgetest_CFLAGS =-DBRIDGE_TEST +odr_bridgetest_SOURCES =bridge.c \ crc.c crc.h diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp index 407c734..aa5a401 100644 --- a/src/MuxElements.cpp +++ b/src/MuxElements.cpp @@ -7,20 +7,20 @@ 2012, Matthias P. Braendli, matthias.braendli@mpb.li */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include <vector> diff --git a/src/MuxElements.h b/src/MuxElements.h index 5556c0e..09f969d 100644 --- a/src/MuxElements.h +++ b/src/MuxElements.h @@ -10,20 +10,20 @@ and save ensemble data. */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _MUX_ELEMENTS #define _MUX_ELEMENTS diff --git a/src/ParserCmdline.cpp b/src/ParserCmdline.cpp index 969f98e..4da495b 100644 --- a/src/ParserCmdline.cpp +++ b/src/ParserCmdline.cpp @@ -10,20 +10,20 @@ line, and builds an ensemble. */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "ParserCmdline.h" diff --git a/src/ParserCmdline.h b/src/ParserCmdline.h index 7bc5741..61d90fc 100644 --- a/src/ParserCmdline.h +++ b/src/ParserCmdline.h @@ -10,20 +10,20 @@ line, and builds an ensemble. */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _PARSER_CMDLINE #define _PARSER_CMDLINE diff --git a/src/ParserConfigfile.cpp b/src/ParserConfigfile.cpp index 3ac6537..947bd64 100644 --- a/src/ParserConfigfile.cpp +++ b/src/ParserConfigfile.cpp @@ -10,20 +10,20 @@ whose definition is given in doc/example.config */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "ParserConfigfile.h" diff --git a/src/ParserConfigfile.h b/src/ParserConfigfile.h index f91a545..adcc806 100644 --- a/src/ParserConfigfile.h +++ b/src/ParserConfigfile.h @@ -10,20 +10,20 @@ whose definition is given in doc/example.config */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _PARSER_CONFIGFILE #define _PARSER_CONFIGFILE diff --git a/src/PcDebug.h b/src/PcDebug.h index 4e966d3..a416bae 100644 --- a/src/PcDebug.h +++ b/src/PcDebug.h @@ -3,20 +3,20 @@ Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef PC_DEBUG_ diff --git a/src/ReedSolomon.cpp b/src/ReedSolomon.cpp index 31d5021..fc4c91e 100644 --- a/src/ReedSolomon.cpp +++ b/src/ReedSolomon.cpp @@ -3,20 +3,20 @@ of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "ReedSolomon.h" diff --git a/src/ReedSolomon.h b/src/ReedSolomon.h index 2a94542..d96a522 100644 --- a/src/ReedSolomon.h +++ b/src/ReedSolomon.h @@ -3,20 +3,20 @@ of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _REEDSOLOMON diff --git a/src/RemoteControl.cpp b/src/RemoteControl.cpp index 7cc975a..2987960 100644 --- a/src/RemoteControl.cpp +++ b/src/RemoteControl.cpp @@ -6,20 +6,20 @@ Written by Matthias P. Braendli, matthias.braendli@mpb.li, 2012 */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include <list> #include <string> diff --git a/src/RemoteControl.h b/src/RemoteControl.h index d0965e0..f8c14fd 100644 --- a/src/RemoteControl.h +++ b/src/RemoteControl.h @@ -9,20 +9,20 @@ see testremotecontrol/test.cpp for an example of how to use this. */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _REMOTECONTROL_H diff --git a/src/StatsServer.cpp b/src/StatsServer.cpp index f870e14..578f8d5 100644 --- a/src/StatsServer.cpp +++ b/src/StatsServer.cpp @@ -10,20 +10,20 @@ This server is very easy to integrate with munin http://munin-monitoring.org/ */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include <errno.h> diff --git a/src/StatsServer.h b/src/StatsServer.h index 8462e6a..9510520 100644 --- a/src/StatsServer.h +++ b/src/StatsServer.h @@ -18,20 +18,20 @@ */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef __STATS_SERVER_H diff --git a/src/TcpServer.cpp b/src/TcpServer.cpp index 00a50e9..20ecffb 100644 --- a/src/TcpServer.cpp +++ b/src/TcpServer.cpp @@ -3,20 +3,20 @@ Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "TcpServer.h" diff --git a/src/TcpServer.h b/src/TcpServer.h index c4d9a4d..bff7e2e 100644 --- a/src/TcpServer.h +++ b/src/TcpServer.h @@ -3,20 +3,20 @@ Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _TCPSERVER diff --git a/src/TcpSocket.cpp b/src/TcpSocket.cpp index 723d06b..89fefd2 100644 --- a/src/TcpSocket.cpp +++ b/src/TcpSocket.cpp @@ -3,20 +3,20 @@ Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "TcpSocket.h" diff --git a/src/TcpSocket.h b/src/TcpSocket.h index 7c92af0..c667cfd 100644 --- a/src/TcpSocket.h +++ b/src/TcpSocket.h @@ -3,20 +3,20 @@ Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _TCPSOCKET diff --git a/src/UdpSocket.cpp b/src/UdpSocket.cpp index f3b2ca0..6d2728b 100644 --- a/src/UdpSocket.cpp +++ b/src/UdpSocket.cpp @@ -3,20 +3,20 @@ Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "UdpSocket.h" diff --git a/src/UdpSocket.h b/src/UdpSocket.h index d96e01e..f1487b3 100644 --- a/src/UdpSocket.h +++ b/src/UdpSocket.h @@ -3,20 +3,20 @@ Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _UDPSOCKET diff --git a/src/bridge.c b/src/bridge.c index 5a9de23..d66a7b2 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -3,20 +3,20 @@ Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include <stdio.h> diff --git a/src/bridge.h b/src/bridge.h index f7d3f41..0bae007 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -3,20 +3,20 @@ Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _BRIDGE @@ -3,20 +3,20 @@ Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "crc.h" @@ -3,20 +3,20 @@ Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _CRC diff --git a/src/dabInput.cpp b/src/dabInput.cpp index 1ec7c51..942e58d 100644 --- a/src/dabInput.cpp +++ b/src/dabInput.cpp @@ -3,20 +3,20 @@ Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInput.h" diff --git a/src/dabInput.h b/src/dabInput.h index 12823b8..e6cea8c 100644 --- a/src/dabInput.h +++ b/src/dabInput.h @@ -3,20 +3,20 @@ Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_H diff --git a/src/dabInputBridgeUdp.cpp b/src/dabInputBridgeUdp.cpp index cc73adb..0aba812 100644 --- a/src/dabInputBridgeUdp.cpp +++ b/src/dabInputBridgeUdp.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputBridgeUdp.h" diff --git a/src/dabInputBridgeUdp.h b/src/dabInputBridgeUdp.h index c75f838..ed00952 100644 --- a/src/dabInputBridgeUdp.h +++ b/src/dabInputBridgeUdp.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_BRIDGE_UDP_H diff --git a/src/dabInputDabplusFifo.cpp b/src/dabInputDabplusFifo.cpp index 48c25b7..e0a9c44 100644 --- a/src/dabInputDabplusFifo.cpp +++ b/src/dabInputDabplusFifo.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputDabplusFifo.h" diff --git a/src/dabInputDabplusFifo.h b/src/dabInputDabplusFifo.h index a02513a..83368d6 100644 --- a/src/dabInputDabplusFifo.h +++ b/src/dabInputDabplusFifo.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_DABPLUS_FIFO_H diff --git a/src/dabInputDabplusFile.cpp b/src/dabInputDabplusFile.cpp index 1a56346..bd968ef 100644 --- a/src/dabInputDabplusFile.cpp +++ b/src/dabInputDabplusFile.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputDabplusFile.h" diff --git a/src/dabInputDabplusFile.h b/src/dabInputDabplusFile.h index 26a67a5..5fe2dec 100644 --- a/src/dabInputDabplusFile.h +++ b/src/dabInputDabplusFile.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_DABPLUS_FILE_H diff --git a/src/dabInputDmbFile.cpp b/src/dabInputDmbFile.cpp index a39878c..9262e6c 100644 --- a/src/dabInputDmbFile.cpp +++ b/src/dabInputDmbFile.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputDmbFile.h" diff --git a/src/dabInputDmbFile.h b/src/dabInputDmbFile.h index f77ab77..8656185 100644 --- a/src/dabInputDmbFile.h +++ b/src/dabInputDmbFile.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_DMB_FILE_H diff --git a/src/dabInputDmbUdp.cpp b/src/dabInputDmbUdp.cpp index 859d27b..e67f90f 100644 --- a/src/dabInputDmbUdp.cpp +++ b/src/dabInputDmbUdp.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputDmbUdp.h" diff --git a/src/dabInputDmbUdp.h b/src/dabInputDmbUdp.h index 1dfcf35..d2a7b30 100644 --- a/src/dabInputDmbUdp.h +++ b/src/dabInputDmbUdp.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_DMB_UDP_H diff --git a/src/dabInputEnhancedFifo.cpp b/src/dabInputEnhancedFifo.cpp index b187aec..3a8a27c 100644 --- a/src/dabInputEnhancedFifo.cpp +++ b/src/dabInputEnhancedFifo.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputEnhancedFifo.h" diff --git a/src/dabInputEnhancedFifo.h b/src/dabInputEnhancedFifo.h index 2479c88..4c87e24 100644 --- a/src/dabInputEnhancedFifo.h +++ b/src/dabInputEnhancedFifo.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_ENHANCED_FIFO_H diff --git a/src/dabInputEnhancedPacketFile.cpp b/src/dabInputEnhancedPacketFile.cpp index b3b48bf..1b5c8bc 100644 --- a/src/dabInputEnhancedPacketFile.cpp +++ b/src/dabInputEnhancedPacketFile.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputEnhancedPacketFile.h" diff --git a/src/dabInputEnhancedPacketFile.h b/src/dabInputEnhancedPacketFile.h index 0f419e0..74f59de 100644 --- a/src/dabInputEnhancedPacketFile.h +++ b/src/dabInputEnhancedPacketFile.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_ENHANCED_PACKET_FILE_H diff --git a/src/dabInputFifo.cpp b/src/dabInputFifo.cpp index 7b2a30f..3e35c20 100644 --- a/src/dabInputFifo.cpp +++ b/src/dabInputFifo.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputFifo.h" diff --git a/src/dabInputFifo.h b/src/dabInputFifo.h index b309130..e5f5206 100644 --- a/src/dabInputFifo.h +++ b/src/dabInputFifo.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_FIFO_H diff --git a/src/dabInputFile.cpp b/src/dabInputFile.cpp index 330519a..30ab37d 100644 --- a/src/dabInputFile.cpp +++ b/src/dabInputFile.cpp @@ -3,20 +3,20 @@ (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputFile.h" diff --git a/src/dabInputFile.h b/src/dabInputFile.h index af2798b..e3eaa48 100644 --- a/src/dabInputFile.h +++ b/src/dabInputFile.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_FILE_H diff --git a/src/dabInputMpegFifo.cpp b/src/dabInputMpegFifo.cpp index b34ee76..0f1d3b0 100644 --- a/src/dabInputMpegFifo.cpp +++ b/src/dabInputMpegFifo.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputMpegFifo.h" diff --git a/src/dabInputMpegFifo.h b/src/dabInputMpegFifo.h index e7b54dd..a14ccbd 100644 --- a/src/dabInputMpegFifo.h +++ b/src/dabInputMpegFifo.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_MPEG_FIFO_H diff --git a/src/dabInputMpegFile.cpp b/src/dabInputMpegFile.cpp index 5bd31e2..724ad54 100644 --- a/src/dabInputMpegFile.cpp +++ b/src/dabInputMpegFile.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputMpegFile.h" diff --git a/src/dabInputMpegFile.h b/src/dabInputMpegFile.h index 741a5f7..a7dcb76 100644 --- a/src/dabInputMpegFile.h +++ b/src/dabInputMpegFile.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_MPEG_FILE_H diff --git a/src/dabInputPacketFile.cpp b/src/dabInputPacketFile.cpp index 0dc157d..3ff4e56 100644 --- a/src/dabInputPacketFile.cpp +++ b/src/dabInputPacketFile.cpp @@ -3,20 +3,20 @@ (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputPacketFile.h" diff --git a/src/dabInputPacketFile.h b/src/dabInputPacketFile.h index 9559ac1..77f33a6 100644 --- a/src/dabInputPacketFile.h +++ b/src/dabInputPacketFile.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_PACKET_FILE_H diff --git a/src/dabInputPrbs.cpp b/src/dabInputPrbs.cpp index b6455ed..8d8c0d9 100644 --- a/src/dabInputPrbs.cpp +++ b/src/dabInputPrbs.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputPrbs.h" diff --git a/src/dabInputPrbs.h b/src/dabInputPrbs.h index e51b79f..22c088c 100644 --- a/src/dabInputPrbs.h +++ b/src/dabInputPrbs.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_PRBS_H diff --git a/src/dabInputRawFifo.cpp b/src/dabInputRawFifo.cpp index 7076143..3a77be3 100644 --- a/src/dabInputRawFifo.cpp +++ b/src/dabInputRawFifo.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputRawFifo.h" diff --git a/src/dabInputRawFifo.h b/src/dabInputRawFifo.h index 4afe55d..7d2a3a0 100644 --- a/src/dabInputRawFifo.h +++ b/src/dabInputRawFifo.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_RAW_FIFO_H diff --git a/src/dabInputRawFile.cpp b/src/dabInputRawFile.cpp index 1cc06a9..88ffa2a 100644 --- a/src/dabInputRawFile.cpp +++ b/src/dabInputRawFile.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputRawFile.h" diff --git a/src/dabInputRawFile.h b/src/dabInputRawFile.h index e75f962..9a4a607 100644 --- a/src/dabInputRawFile.h +++ b/src/dabInputRawFile.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_RAW_FILE_H diff --git a/src/dabInputSlip.cpp b/src/dabInputSlip.cpp index 52b9280..cf6e8bc 100644 --- a/src/dabInputSlip.cpp +++ b/src/dabInputSlip.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputSlip.h" diff --git a/src/dabInputSlip.h b/src/dabInputSlip.h index bcaf0d1..2b8a782 100644 --- a/src/dabInputSlip.h +++ b/src/dabInputSlip.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_SLIP_H diff --git a/src/dabInputTest.cpp b/src/dabInputTest.cpp index 78adaa8..fd4fc59 100644 --- a/src/dabInputTest.cpp +++ b/src/dabInputTest.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputTest.h" diff --git a/src/dabInputTest.h b/src/dabInputTest.h index 5e21e80..34ebc05 100644 --- a/src/dabInputTest.h +++ b/src/dabInputTest.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_TEST_H diff --git a/src/dabInputUdp.cpp b/src/dabInputUdp.cpp index ee3ab32..f6fda1e 100644 --- a/src/dabInputUdp.cpp +++ b/src/dabInputUdp.cpp @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInputUdp.h" diff --git a/src/dabInputUdp.h b/src/dabInputUdp.h index c0de1dd..ac9ddb0 100644 --- a/src/dabInputUdp.h +++ b/src/dabInputUdp.h @@ -3,20 +3,20 @@ Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_UDP_H diff --git a/src/dabInputZmq.cpp b/src/dabInputZmq.cpp index c84e81c..d0cf6b7 100644 --- a/src/dabInputZmq.cpp +++ b/src/dabInputZmq.cpp @@ -16,20 +16,20 @@ (subscriptions), seamless access to multiple transport protocols and more. */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabInput.h" diff --git a/src/dabInputZmq.h b/src/dabInputZmq.h index bb37a94..f1c863f 100644 --- a/src/dabInputZmq.h +++ b/src/dabInputZmq.h @@ -16,22 +16,22 @@ (subscriptions), seamless access to multiple transport protocols and more. */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. It defines a ZeroMQ input for dabplus data. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DAB_INPUT_ZMQ_H diff --git a/src/dabOutput/dabOutput.h b/src/dabOutput/dabOutput.h index bbf27e3..d076041 100644 --- a/src/dabOutput/dabOutput.h +++ b/src/dabOutput/dabOutput.h @@ -8,20 +8,20 @@ An object-oriented version of the output channels. */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef __DAB_OUTPUT_H diff --git a/src/dabOutput/dabOutputFifo.cpp b/src/dabOutput/dabOutputFifo.cpp index ea0f538..de9579e 100644 --- a/src/dabOutput/dabOutputFifo.cpp +++ b/src/dabOutput/dabOutputFifo.cpp @@ -8,20 +8,20 @@ Fifo output is very similar to file, except it doesn't seek */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include <cstdio> #include <cstring> diff --git a/src/dabOutput/dabOutputFile.cpp b/src/dabOutput/dabOutputFile.cpp index 79dbeee..f26ddfd 100644 --- a/src/dabOutput/dabOutputFile.cpp +++ b/src/dabOutput/dabOutputFile.cpp @@ -8,20 +8,20 @@ File output */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include <cstdio> #include <cstring> diff --git a/src/dabOutput/dabOutputRaw.cpp b/src/dabOutput/dabOutputRaw.cpp index eb70712..137f079 100644 --- a/src/dabOutput/dabOutputRaw.cpp +++ b/src/dabOutput/dabOutputRaw.cpp @@ -8,20 +8,20 @@ RAW output used for farsync */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include <cstdio> #include <cstring> diff --git a/src/dabOutput/dabOutputSimul.cpp b/src/dabOutput/dabOutputSimul.cpp index 176649b..b40a757 100644 --- a/src/dabOutput/dabOutputSimul.cpp +++ b/src/dabOutput/dabOutputSimul.cpp @@ -8,20 +8,20 @@ SIMUL throttling output. It guarantees correct frame generation rate */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabOutput.h" #include <cstring> diff --git a/src/dabOutput/dabOutputTcp.cpp b/src/dabOutput/dabOutputTcp.cpp index 427018e..5f1943d 100644 --- a/src/dabOutput/dabOutputTcp.cpp +++ b/src/dabOutput/dabOutputTcp.cpp @@ -8,20 +8,20 @@ TCP output */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include <cstring> #include <cstdio> diff --git a/src/dabOutput/dabOutputUdp.cpp b/src/dabOutput/dabOutputUdp.cpp index 607fe71..9664a2d 100644 --- a/src/dabOutput/dabOutputUdp.cpp +++ b/src/dabOutput/dabOutputUdp.cpp @@ -8,20 +8,20 @@ UDP output */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include <cstring> diff --git a/src/dabOutput/dabOutputZMQ.cpp b/src/dabOutput/dabOutputZMQ.cpp index 24fa6dc..2644edf 100644 --- a/src/dabOutput/dabOutputZMQ.cpp +++ b/src/dabOutput/dabOutputZMQ.cpp @@ -17,20 +17,20 @@ */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/src/dabUtils.cpp b/src/dabUtils.cpp index 693d300..dd2965b 100644 --- a/src/dabUtils.cpp +++ b/src/dabUtils.cpp @@ -3,20 +3,20 @@ Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "dabUtils.h" diff --git a/src/dabUtils.h b/src/dabUtils.h index 04bb468..9ef31d7 100644 --- a/src/dabUtils.h +++ b/src/dabUtils.h @@ -3,20 +3,20 @@ Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DABUTILS @@ -3,20 +3,20 @@ the Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "mpeg.h" @@ -3,20 +3,20 @@ the Queen in Right of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _MPEG @@ -3,20 +3,20 @@ of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include "prbs.h" @@ -3,20 +3,20 @@ of Canada (Communications Research Center Canada) */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _PRBS diff --git a/src/utils.cpp b/src/utils.cpp index 4213f28..b7e1400 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -7,20 +7,20 @@ Matthias P. Braendli, http://mpb.li, matthias.braendli@mpb.li */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #include <cstring> #include "DabMux.h" diff --git a/src/utils.h b/src/utils.h index 01b6436..75d1b6e 100644 --- a/src/utils.h +++ b/src/utils.h @@ -10,20 +10,20 @@ useful information to the user. */ /* - This file is part of CRC-DabMux. + This file is part of ODR-DabMux. - CRC-DabMux is free software: you can redistribute it and/or modify + ODR-DabMux is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - CRC-DabMux is distributed in the hope that it will be useful, + ODR-DabMux is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _UTILS_H #define _UTILS_H |