diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-07 21:37:47 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-07 21:37:47 +0100 |
| commit | 95b197a53c8314a68fd8cf73e495018844e7d708 (patch) | |
| tree | d7a1f48c0c7f04bea34c9e19dc219195469df563 /src/DabMux.h | |
| parent | 33e51f5996c02c6a6aee27b57d91d90e3f1db5a2 (diff) | |
| parent | 21d8cacffc1201514b0e1143f8de60e754262291 (diff) | |
| download | dabmux-95b197a53c8314a68fd8cf73e495018844e7d708.tar.gz dabmux-95b197a53c8314a68fd8cf73e495018844e7d708.tar.bz2 dabmux-95b197a53c8314a68fd8cf73e495018844e7d708.zip | |
Merge rework of inputs into 'next'
This breaks the non-blocking fifo inputs, as it seems nobody is
using them.
It restores some UDP functionality, not necessarily in the same way as
before.
Diffstat (limited to 'src/DabMux.h')
| -rw-r--r-- | src/DabMux.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/DabMux.h b/src/DabMux.h index 5dda759..80b4881 100644 --- a/src/DabMux.h +++ b/src/DabMux.h @@ -25,8 +25,7 @@ You should have received a copy of the GNU General Public License along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _DABMUX_H -#define _DABMUX_H +#pragma once #include <stdint.h> #include <string> @@ -34,7 +33,7 @@ #include "DabMultiplexer.h" #include "RemoteControl.h" #include "dabOutput/dabOutput.h" -#include "dabInput.h" +#include "input/inputs.h" #include "Eti.h" #include "MuxElements.h" @@ -44,5 +43,3 @@ # include <sys/time.h> #endif -#endif - |