diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-12 16:30:30 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-11-12 16:30:30 +0100 |
| commit | 96b4dc4efca1b164f79a7f7394449866f034ac31 (patch) | |
| tree | 101b796f40fee444c8193ccc3e13cf5644c83d5f /src/DabMux.h | |
| parent | 5132756f09c7a0dafe4644db92718ee3d1a58d6c (diff) | |
| parent | fedab89cd4625617b3e481f1f59ba0fc97b7305b (diff) | |
| download | dabmux-96b4dc4efca1b164f79a7f7394449866f034ac31.tar.gz dabmux-96b4dc4efca1b164f79a7f7394449866f034ac31.tar.bz2 dabmux-96b4dc4efca1b164f79a7f7394449866f034ac31.zip | |
Merge branch 'next' into servicelinking
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 - |