mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 15:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

unify handling of playback header

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 91137035de
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-22 (Sat, 22 Dec 2018)

Origin message was:
------------------
- unify handling of playback header

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-12-22 20:17:14 +01:00
committed by max_10
parent 818e38734e
commit f3dcd28bc8
10 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -76,7 +76,6 @@ pkginclude_HEADERS = \
include/hardware_caps.h \ include/hardware_caps.h \
include/init_td.h \ include/init_td.h \
include/mmi.h \ include/mmi.h \
include/playback.h \
include/playback_hal.h \ include/playback_hal.h \
include/pwrmngr.h \ include/pwrmngr.h \
include/record_hal.h \ include/record_hal.h \

2
azbox/playback.cpp
View File

@@ -50,7 +50,7 @@
#define IN_FILE "/tmp/rmfp.in2" #define IN_FILE "/tmp/rmfp.in2"
#define OUT_FILE "/tmp/rmfp.out2" #define OUT_FILE "/tmp/rmfp.out2"
#include "playback.h" #include "playback_lib.h"
extern "C"{ extern "C"{
#include "e2mruainclude.h" #include "e2mruainclude.h"

6
azbox/playback.h → azbox/playback_lib.h
View File

@@ -1,5 +1,5 @@
#ifndef __PLAYBACK_H #ifndef __PLAYBACK_LIB_H_
#define __PLAYBACK_H #define __PLAYBACK_LIB_H_
#include <string> #include <string>
#include <stdint.h> #include <stdint.h>
@@ -59,4 +59,4 @@ class cPlayback
void DMNotify(int Event, void *pTsBuf, void *Tag); void DMNotify(int Event, void *pTsBuf, void *Tag);
#endif #endif
}; };
#endif #endif // __PLAYBACK_LIB_H_

2
common/ca.cpp
View File

@@ -1,6 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include "ca.h" #include "ca_hal.h"
#include "lt_debug.h" #include "lt_debug.h"
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_CA, this, args) #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_CA, this, args)

2
generic-pc/playback.cpp
View File

@@ -1,6 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include "playback.h" #include "playback_lib.h"
static const char * FILENAME = "playback-dummy"; static const char * FILENAME = "playback-dummy";

0
generic-pc/playback.h → generic-pc/playback_lib.h
View File

2
include/playback.h
View File

@@ -1,2 +0,0 @@
#include <config.h>
#include "playback_hal.h"

6
include/playback_hal.h
View File

@@ -12,15 +12,15 @@
#include "../libarmbox/playback_libeplayer3.h" #include "../libarmbox/playback_libeplayer3.h"
#endif #endif
#elif HAVE_AZBOX_HARDWARE #elif HAVE_AZBOX_HARDWARE
#include "../azbox/playback.h" #include "../azbox/playback_lib.h"
#elif HAVE_GENERIC_HARDWARE #elif HAVE_GENERIC_HARDWARE
#if BOXMODEL_RASPI #if BOXMODEL_RASPI
#include "../raspi/playback.h" #include "../raspi/playback_lib.h"
#else #else
#if ENABLE_GSTREAMER #if ENABLE_GSTREAMER
#include "../generic-pc/playback_gst.h" #include "../generic-pc/playback_gst.h"
#else #else
#include "../generic-pc/playback.h" #include "../generic-pc/playback_lib.h"
#endif #endif
#endif #endif
#else #else

1
raspi/playback.h
View File

@@ -1 +0,0 @@
../generic-pc/playback.h

1
raspi/playback_lib.h Symbolic link
View File

@@ -0,0 +1 @@
../generic-pc/playback_lib.h