Merge remote-tracking branch 'max/master'

Origin commit data
------------------
Branch: master
Commit: 10a5dcc938
Author: Frankenstone <dampf_acc@online.de>
Date: 2018-12-25 (Tue, 25 Dec 2018)


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

------------------
This commit was generated by Migit

Makefile.am

@@ -3,12 +3,11 @@ ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES = libstb-hal.la
 libstb_hal_la_SOURCES =
 SUBDIRS = common tools
-#bin_PROGRAMS = libstb-hal-test
 
 libstb_hal_la_LIBADD = \
 	common/libcommon.la
 
-
+#bin_PROGRAMS = libstb-hal-test
 #libstb_hal_test_SOURCES = libtest.cpp
 #libstb_hal_test_LDADD = libstb-hal.la
 
@@ -19,34 +18,34 @@ libstb_hal_la_LIBADD += \
 	libtriple/libtriple.la
 endif
 if BOXTYPE_AZBOX
-SUBDIRS += azbox
+SUBDIRS += libazbox
 libstb_hal_la_LIBADD += \
-	azbox/libazbox.la
+	libazbox/libazbox.la
 endif
 if BOXTYPE_GENERIC
 if BOXMODEL_RASPI
-SUBDIRS += raspi
+SUBDIRS += libraspi
 libstb_hal_la_LIBADD += \
-	raspi/libraspi.la
+	libraspi/libraspi.la
 else
-SUBDIRS += generic-pc
+SUBDIRS += libgeneric-pc
 libstb_hal_la_LIBADD += \
-	generic-pc/libgeneric.la
+	libgeneric-pc/libgeneric.la
 endif
 endif
 if BOXTYPE_SPARK
 #libstb_hal_test_LDADD += -lasound
-SUBDIRS += libspark libeplayer3
+SUBDIRS += libspark libeplayer3-sh4
 libstb_hal_la_LIBADD += \
 	libspark/libspark.la \
-	libeplayer3/libeplayer3.la
+	libeplayer3-sh4/libeplayer3_sh4.la
 endif
 if BOXTYPE_DUCKBOX
 #libstb_hal_test_LDADD += -lasound
-SUBDIRS += libduckbox libeplayer3 libdvbci
+SUBDIRS += libduckbox libeplayer3-sh4 libdvbci
 libstb_hal_la_LIBADD += \
 	libduckbox/libduckbox.la \
-	libeplayer3/libeplayer3.la \
+	libeplayer3-sh4/libeplayer3_sh4.la \
 	libdvbci/libdvbci.la
 endif
 if BOXTYPE_ARMBOX
@@ -67,21 +66,17 @@ endif
 
 pkginclude_HEADERS = \
 	include/audio_hal.h \
-	include/ca_cs.h \
 	include/ca.h \
-	include/cs_api.h \
 	include/ca_ci.h \
+	include/ca_hal.h \
+	include/cs_api.h \
 	include/cs_types.h \
-	include/dmx_cs.h \
 	include/dmx_hal.h \
 	include/glfb.h \
 	include/hardware_caps.h \
-	include/init_cs.h \
-	include/init_td.h \
+	include/init.h \
 	include/mmi.h \
-	include/playback.h \
 	include/playback_hal.h \
 	include/pwrmngr.h \
 	include/record_hal.h \
-	include/video_cs.h \
 	include/video_hal.h

common/ca.cpp

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

configure.ac

@@ -89,16 +89,16 @@ fi
 AC_OUTPUT([
 Makefile
 common/Makefile
-libeplayer3/Makefile
-libeplayer3-arm/Makefile
-azbox/Makefile
-generic-pc/Makefile
+libarmbox/Makefile
+libazbox/Makefile
 libduckbox/Makefile
 libdvbci/Makefile
-libtriple/Makefile
+libeplayer3-arm/Makefile
+libeplayer3-sh4/Makefile
+libgeneric-pc/Makefile
+libraspi/Makefile
 libspark/Makefile
-libarmbox/Makefile
-raspi/Makefile
+libtriple/Makefile
 tools/Makefile
 ])
 

include/audio_hal.h

@@ -10,12 +10,12 @@
 #elif HAVE_ARM_HARDWARE
 #include "../libarmbox/audio_lib.h"
 #elif HAVE_AZBOX_HARDWARE
-#include "../azbox/audio_lib.h"
+#include "../libazbox/audio_lib.h"
 #elif HAVE_GENERIC_HARDWARE
 #if BOXMODEL_RASPI
-#include "../raspi/audio_lib.h"
+#include "../libraspi/audio_lib.h"
 #else
-#include "../generic-pc/audio_lib.h"
+#include "../libgeneric-pc/audio_lib.h"
 #endif
 #else
 #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined

include/ca.h

@@ -1,11 +1,5 @@
-/*
- * dummy functions to implement ca_cs.h interface
- */
-#if HAVE_DUCKBOX_HARDWARE || HAVE_ARM_HARDWARE
-#include "ca_ci.h"
-#else
-#ifndef __CA_LIBTRIPLE_H_
-#define __CA_LIBTRIPLE_H_
+#ifndef __ca__
+#define __ca__
 
 #include <stdint.h>
 #include "cs_types.h"
@@ -122,5 +116,4 @@ public:
 	virtual ~cCA();
 };
 
-#endif // __CA_LIBTRIPLE_H_
-#endif // HAVE_DUCKBOX_HARDWARE
+#endif // __ca__

include/ca_ci.h

@@ -1,5 +1,5 @@
-#ifndef __CA_H_
-#define __CA_H_
+#ifndef __ca_ci__
+#define __ca_ci__
 
 #include <config.h>
 #include <stdint.h>
@@ -362,4 +362,4 @@ public:
 	virtual ~cCA();
 };
 
-#endif ///__CA_H_
+#endif // __ca_ci__

include/ca_cs.h

@@ -1 +0,0 @@
-#include "ca.h"

include/ca_hal.h

@@ -0,0 +1,5 @@
+#if HAVE_DUCKBOX_HARDWARE || HAVE_ARM_HARDWARE
+#include "ca_ci.h"
+#else
+#include "ca.h"
+#endif

include/cs_api.h

@@ -4,7 +4,7 @@
 #ifndef __CS_API_H_
 #define __CS_API_H_
 
-#include "init_td.h"
+#include "init.h"
 #include <config.h>
 
 typedef void (*cs_messenger) (unsigned int msg, unsigned int data);

include/cs_frontpanel.h

@@ -1,5 +1,5 @@
-#ifndef __DUCKBOX_VFD__
-#define __DUCKBOX_VFD__
+#ifndef __CS_FRONTPANEL_H_
+#define __CS_FRONTPANEL_H_
 
 #define VFDDISPLAYCHARS      0xc0425a00
 #define VFDWRITECGRAM        0x40425a01
@@ -317,4 +317,4 @@ typedef struct {
 	bool			number_support;
 } fp_display_caps_t;
 
-#endif /* __DUCKBOX_VFD__ */
+#endif // __CS_FRONTPANEL_H_

include/dmx_cs.h

@@ -1 +0,0 @@
-#include "dmx_hal.h"

include/hardware_caps.h

@@ -40,6 +40,7 @@ typedef struct hw_caps
 	int display_can_deepstandby;
 	int display_has_statusline;
 	int has_button_timer;
+	int has_button_vformat;
 	char boxvendor[64];
 	char boxname[64];
 	char boxarch[64];

include/init.h

@@ -0,0 +1,5 @@
+#ifndef __init__
+#define __init__
+void init_td_api();
+void shutdown_td_api();
+#endif // __init__

include/init_cs.h

@@ -1,2 +0,0 @@
-#warning using init_cs.h from libstb-hal
-#include "init_td.h"

include/init_td.h

@@ -1,5 +0,0 @@
-#ifndef __INIT_TD_H
-#define __INIT_TD_H
-void init_td_api();
-void shutdown_td_api();
-#endif

include/playback.h

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

include/playback_hal.h

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

include/record_hal.h

@@ -8,12 +8,12 @@
 #elif HAVE_ARM_HARDWARE
 #include "../libarmbox/record_lib.h"
 #elif HAVE_AZBOX_HARDWARE
-#include "../azbox/record_lib.h"
+#include "../libazbox/record_lib.h"
 #elif HAVE_GENERIC_HARDWARE
 #if BOXMODEL_RASPI
-#include "../raspi/record_lib.h"
+#include "../libraspi/record_lib.h"
 #else
-#include "../generic-pc/record_lib.h"
+#include "../libgeneric-pc/record_lib.h"
 #endif
 #else
 #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined

include/video_cs.h

@@ -1 +0,0 @@
-#include "video_hal.h"

include/video_hal.h

@@ -9,12 +9,12 @@
 #include "../libarmbox/video_lib.h"
 #include "../libarmbox/hdmi_cec.h"
 #elif HAVE_AZBOX_HARDWARE
-#include "../azbox/video_lib.h"
+#include "../libazbox/video_lib.h"
 #elif HAVE_GENERIC_HARDWARE
 #if BOXMODEL_RASPI
-#include "../raspi/video_lib.h"
+#include "../libraspi/video_lib.h"
 #else
-#include "../generic-pc/video_lib.h"
+#include "../libgeneric-pc/video_lib.h"
 #endif
 #else
 #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined

libarmbox/init.cpp

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "init_td.h"
+#include "init.h"
 #include "pwrmngr.h"
 #include <proc_tools.h>
 

libazbox/init.cpp

@@ -1,6 +1,6 @@
 #include <unistd.h>
 
-#include "init_td.h"
+#include "init.h"
 
 #include "lt_debug.h"
 #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args)

libazbox/playback.cpp

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

libazbox/playback_lib.h

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

libduckbox/Makefile.am

@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libduckbox.la
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/common \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libeplayer3/include
+	-I$(top_srcdir)/libeplayer3-sh4/include
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 

libduckbox/init.cpp

@@ -10,7 +10,7 @@
 
 #include <linux/dvb/dmx.h>
 
-#include "init_td.h"
+#include "init.h"
 #include "pwrmngr.h"
 
 #include "lt_debug.h"

libdvbci/dvbci_mmi.cpp

@@ -5,7 +5,7 @@
 #include <stdio.h>
 
 #include "dvbci_mmi.h"
-#include <ca_cs.h>
+#include <ca_ci.h>
 
 eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot)
 {

libeplayer3-sh4/Makefile.am

@@ -1,13 +1,13 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-noinst_LTLIBRARIES = libeplayer3.la
+noinst_LTLIBRARIES = libeplayer3_sh4.la
 
 AM_CPPFLAGS = -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 AM_CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 AM_CPPFLAGS += -I$(srcdir)/include
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 
-libeplayer3_la_SOURCES = \
+libeplayer3_sh4_la_SOURCES = \
 	input.cpp output.cpp manager.cpp player.cpp \
 	writer/writer.cpp \
 	writer/pes.cpp \
@@ -18,6 +18,6 @@ libeplayer3_la_SOURCES = \
 # writer/h264.cpp
 # writer/h263.cpp writer/vc1.cpp writer/pcm.cpp writer/aac.cpp
 
-LIBEPLAYER3_LIBS = libeplayer3.la
+LIBEPLAYER3_LIBS = libeplayer3_sh4.la
 # -lpthread -lavformat -lavcodec -lavutil -lswresample -lm
 

libgeneric-pc/init.cpp

@@ -2,7 +2,7 @@
 #include <cstdlib>
 #include <unistd.h>
 
-#include "init_td.h"
+#include "init.h"
 #include "glfb.h"
 
 #include "lt_debug.h"

libgeneric-pc/playback.cpp

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

libraspi/dmx.cpp

@@ -32,7 +32,7 @@
 #include <cstdio>
 #include <string>
 #include <sys/ioctl.h>
-#include "dmx_hal.h"
+#include "dmx_lib.h"
 #include "lt_debug.h"
 
 #include "video_lib.h"

libraspi/init.cpp

@@ -34,7 +34,7 @@
 #include <map>
 #include <OpenThreads/Thread>
 
-#include "init_td.h"
+#include "init.h"
 #include "lt_debug.h"
 #include "glfb.h"
 #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args)

libraspi/playback.cpp

@@ -0,0 +1 @@
+../libgeneric-pc/playback.cpp

libraspi/playback_lib.h

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

libspark/Makefile.am

@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libspark.la
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/common \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libeplayer3/include
+	-I$(top_srcdir)/libeplayer3-sh4/include
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 AM_LDFLAGS = \

libspark/init.cpp

@@ -13,7 +13,7 @@
 
 #include <linux/dvb/dmx.h>
 
-#include "init_td.h"
+#include "init.h"
 #include "pwrmngr.h"
 
 #include "lt_debug.h"

libtest.cpp

@@ -8,7 +8,7 @@
 #include <config.h>
 #include <stdint.h>
 #include <unistd.h>
-#include <include/init_td.h>
+#include <include/init.h>
 #if HAVE_GENERIC_HARDWARE
 #include <include/glfb.h>