diff --git a/Makefile.am b/Makefile.am index c26789f..cd5fab2 100644 --- a/Makefile.am +++ b/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 diff --git a/common/ca.cpp b/common/ca.cpp index f6ebea2..17f37aa 100644 --- a/common/ca.cpp +++ b/common/ca.cpp @@ -1,6 +1,6 @@ #include -#include "ca.h" +#include "ca_hal.h" #include "lt_debug.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_CA, this, args) diff --git a/configure.ac b/configure.ac index e149c33..df30f91 100644 --- a/configure.ac +++ b/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 ]) diff --git a/include/audio_hal.h b/include/audio_hal.h index f45ea2d..6ea7a74 100644 --- a/include/audio_hal.h +++ b/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 diff --git a/include/ca.h b/include/ca.h index a087805..d615f43 100644 --- a/include/ca.h +++ b/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 #include "cs_types.h" @@ -122,5 +116,4 @@ public: virtual ~cCA(); }; -#endif // __CA_LIBTRIPLE_H_ -#endif // HAVE_DUCKBOX_HARDWARE +#endif // __ca__ diff --git a/include/ca_ci.h b/include/ca_ci.h index ee15f94..1ef8d48 100644 --- a/include/ca_ci.h +++ b/include/ca_ci.h @@ -1,5 +1,5 @@ -#ifndef __CA_H_ -#define __CA_H_ +#ifndef __ca_ci__ +#define __ca_ci__ #include #include @@ -362,4 +362,4 @@ public: virtual ~cCA(); }; -#endif ///__CA_H_ +#endif // __ca_ci__ diff --git a/include/ca_cs.h b/include/ca_cs.h deleted file mode 100644 index dae70d6..0000000 --- a/include/ca_cs.h +++ /dev/null @@ -1 +0,0 @@ -#include "ca.h" diff --git a/include/ca_hal.h b/include/ca_hal.h new file mode 100644 index 0000000..09e964f --- /dev/null +++ b/include/ca_hal.h @@ -0,0 +1,5 @@ +#if HAVE_DUCKBOX_HARDWARE || HAVE_ARM_HARDWARE +#include "ca_ci.h" +#else +#include "ca.h" +#endif diff --git a/include/cs_api.h b/include/cs_api.h index 38ecf2c..05b0c9f 100644 --- a/include/cs_api.h +++ b/include/cs_api.h @@ -4,7 +4,7 @@ #ifndef __CS_API_H_ #define __CS_API_H_ -#include "init_td.h" +#include "init.h" #include typedef void (*cs_messenger) (unsigned int msg, unsigned int data); diff --git a/include/cs_frontpanel.h b/include/cs_frontpanel.h index ce35f11..9d9336b 100644 --- a/include/cs_frontpanel.h +++ b/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_ diff --git a/include/dmx_cs.h b/include/dmx_cs.h deleted file mode 100644 index 7f86974..0000000 --- a/include/dmx_cs.h +++ /dev/null @@ -1 +0,0 @@ -#include "dmx_hal.h" diff --git a/include/hardware_caps.h b/include/hardware_caps.h index 3a553ca..44a11a9 100644 --- a/include/hardware_caps.h +++ b/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]; diff --git a/include/init.h b/include/init.h new file mode 100644 index 0000000..7ae0577 --- /dev/null +++ b/include/init.h @@ -0,0 +1,5 @@ +#ifndef __init__ +#define __init__ +void init_td_api(); +void shutdown_td_api(); +#endif // __init__ diff --git a/include/init_cs.h b/include/init_cs.h deleted file mode 100644 index 609c3e1..0000000 --- a/include/init_cs.h +++ /dev/null @@ -1,2 +0,0 @@ -#warning using init_cs.h from libstb-hal -#include "init_td.h" diff --git a/include/init_td.h b/include/init_td.h deleted file mode 100644 index d9a6f09..0000000 --- a/include/init_td.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef __INIT_TD_H -#define __INIT_TD_H -void init_td_api(); -void shutdown_td_api(); -#endif diff --git a/include/playback.h b/include/playback.h deleted file mode 100644 index c62544b..0000000 --- a/include/playback.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#include "playback_hal.h" diff --git a/include/playback_hal.h b/include/playback_hal.h index 5891fd2..e18cab2 100644 --- a/include/playback_hal.h +++ b/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 diff --git a/include/record_hal.h b/include/record_hal.h index 40f50e6..a5b0fdf 100644 --- a/include/record_hal.h +++ b/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 diff --git a/include/video_cs.h b/include/video_cs.h deleted file mode 100644 index f1d48d4..0000000 --- a/include/video_cs.h +++ /dev/null @@ -1 +0,0 @@ -#include "video_hal.h" diff --git a/include/video_hal.h b/include/video_hal.h index 0ea7d6c..8e30d4c 100644 --- a/include/video_hal.h +++ b/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 diff --git a/libarmbox/init.cpp b/libarmbox/init.cpp index f7374d1..682bf1c 100644 --- a/libarmbox/init.cpp +++ b/libarmbox/init.cpp @@ -8,7 +8,7 @@ #include #include -#include "init_td.h" +#include "init.h" #include "pwrmngr.h" #include diff --git a/azbox/Makefile.am b/libazbox/Makefile.am similarity index 100% rename from azbox/Makefile.am rename to libazbox/Makefile.am diff --git a/azbox/audio.cpp b/libazbox/audio.cpp similarity index 100% rename from azbox/audio.cpp rename to libazbox/audio.cpp diff --git a/azbox/audio_lib.h b/libazbox/audio_lib.h similarity index 100% rename from azbox/audio_lib.h rename to libazbox/audio_lib.h diff --git a/azbox/dmx.cpp b/libazbox/dmx.cpp similarity index 100% rename from azbox/dmx.cpp rename to libazbox/dmx.cpp diff --git a/azbox/e2mruainclude.h b/libazbox/e2mruainclude.h similarity index 100% rename from azbox/e2mruainclude.h rename to libazbox/e2mruainclude.h diff --git a/azbox/hardware_caps.c b/libazbox/hardware_caps.c similarity index 100% rename from azbox/hardware_caps.c rename to libazbox/hardware_caps.c diff --git a/azbox/init.cpp b/libazbox/init.cpp similarity index 95% rename from azbox/init.cpp rename to libazbox/init.cpp index 2029b4f..7c930f1 100644 --- a/azbox/init.cpp +++ b/libazbox/init.cpp @@ -1,6 +1,6 @@ #include -#include "init_td.h" +#include "init.h" #include "lt_debug.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args) diff --git a/azbox/playback.cpp b/libazbox/playback.cpp similarity index 99% rename from azbox/playback.cpp rename to libazbox/playback.cpp index 1e656f3..c387c6f 100644 --- a/azbox/playback.cpp +++ b/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" diff --git a/azbox/playback.h b/libazbox/playback_lib.h similarity index 95% rename from azbox/playback.h rename to libazbox/playback_lib.h index c56c69e..6997acb 100644 --- a/azbox/playback.h +++ b/libazbox/playback_lib.h @@ -1,5 +1,5 @@ -#ifndef __PLAYBACK_H -#define __PLAYBACK_H +#ifndef __PLAYBACK_LIB_H_ +#define __PLAYBACK_LIB_H_ #include #include @@ -59,4 +59,4 @@ class cPlayback void DMNotify(int Event, void *pTsBuf, void *Tag); #endif }; -#endif +#endif // __PLAYBACK_LIB_H_ diff --git a/azbox/record.cpp b/libazbox/record.cpp similarity index 100% rename from azbox/record.cpp rename to libazbox/record.cpp diff --git a/azbox/record_lib.h b/libazbox/record_lib.h similarity index 100% rename from azbox/record_lib.h rename to libazbox/record_lib.h diff --git a/azbox/video.cpp b/libazbox/video.cpp similarity index 100% rename from azbox/video.cpp rename to libazbox/video.cpp diff --git a/azbox/video_lib.h b/libazbox/video_lib.h similarity index 100% rename from azbox/video_lib.h rename to libazbox/video_lib.h diff --git a/libduckbox/Makefile.am b/libduckbox/Makefile.am index 5b47cab..d636086 100644 --- a/libduckbox/Makefile.am +++ b/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 diff --git a/libduckbox/init.cpp b/libduckbox/init.cpp index f429afe..3abc241 100644 --- a/libduckbox/init.cpp +++ b/libduckbox/init.cpp @@ -10,7 +10,7 @@ #include -#include "init_td.h" +#include "init.h" #include "pwrmngr.h" #include "lt_debug.h" diff --git a/libdvbci/dvbci_mmi.cpp b/libdvbci/dvbci_mmi.cpp index b8c2794..5c87c09 100644 --- a/libdvbci/dvbci_mmi.cpp +++ b/libdvbci/dvbci_mmi.cpp @@ -5,7 +5,7 @@ #include #include "dvbci_mmi.h" -#include +#include eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot) { diff --git a/libeplayer3/Makefile.am b/libeplayer3-sh4/Makefile.am similarity index 84% rename from libeplayer3/Makefile.am rename to libeplayer3-sh4/Makefile.am index 814d106..d129566 100644 --- a/libeplayer3/Makefile.am +++ b/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 diff --git a/libeplayer3/README b/libeplayer3-sh4/README similarity index 100% rename from libeplayer3/README rename to libeplayer3-sh4/README diff --git a/libeplayer3/include/input.h b/libeplayer3-sh4/include/input.h similarity index 100% rename from libeplayer3/include/input.h rename to libeplayer3-sh4/include/input.h diff --git a/libeplayer3/include/manager.h b/libeplayer3-sh4/include/manager.h similarity index 100% rename from libeplayer3/include/manager.h rename to libeplayer3-sh4/include/manager.h diff --git a/libeplayer3/include/misc.h b/libeplayer3-sh4/include/misc.h similarity index 100% rename from libeplayer3/include/misc.h rename to libeplayer3-sh4/include/misc.h diff --git a/libeplayer3/include/output.h b/libeplayer3-sh4/include/output.h similarity index 100% rename from libeplayer3/include/output.h rename to libeplayer3-sh4/include/output.h diff --git a/libeplayer3/include/pes.h b/libeplayer3-sh4/include/pes.h similarity index 100% rename from libeplayer3/include/pes.h rename to libeplayer3-sh4/include/pes.h diff --git a/libeplayer3/include/player.h b/libeplayer3-sh4/include/player.h similarity index 100% rename from libeplayer3/include/player.h rename to libeplayer3-sh4/include/player.h diff --git a/libeplayer3/include/writer.h b/libeplayer3-sh4/include/writer.h similarity index 100% rename from libeplayer3/include/writer.h rename to libeplayer3-sh4/include/writer.h diff --git a/libeplayer3/input.cpp b/libeplayer3-sh4/input.cpp similarity index 100% rename from libeplayer3/input.cpp rename to libeplayer3-sh4/input.cpp diff --git a/libeplayer3/manager.cpp b/libeplayer3-sh4/manager.cpp similarity index 100% rename from libeplayer3/manager.cpp rename to libeplayer3-sh4/manager.cpp diff --git a/libeplayer3/output.cpp b/libeplayer3-sh4/output.cpp similarity index 100% rename from libeplayer3/output.cpp rename to libeplayer3-sh4/output.cpp diff --git a/libeplayer3/player.cpp b/libeplayer3-sh4/player.cpp similarity index 100% rename from libeplayer3/player.cpp rename to libeplayer3-sh4/player.cpp diff --git a/libeplayer3/writer/aac.cpp b/libeplayer3-sh4/writer/aac.cpp similarity index 100% rename from libeplayer3/writer/aac.cpp rename to libeplayer3-sh4/writer/aac.cpp diff --git a/libeplayer3/writer/ac3.cpp b/libeplayer3-sh4/writer/ac3.cpp similarity index 100% rename from libeplayer3/writer/ac3.cpp rename to libeplayer3-sh4/writer/ac3.cpp diff --git a/libeplayer3/writer/divx.cpp b/libeplayer3-sh4/writer/divx.cpp similarity index 100% rename from libeplayer3/writer/divx.cpp rename to libeplayer3-sh4/writer/divx.cpp diff --git a/libeplayer3/writer/dts.cpp b/libeplayer3-sh4/writer/dts.cpp similarity index 100% rename from libeplayer3/writer/dts.cpp rename to libeplayer3-sh4/writer/dts.cpp diff --git a/libeplayer3/writer/h263.cpp b/libeplayer3-sh4/writer/h263.cpp similarity index 100% rename from libeplayer3/writer/h263.cpp rename to libeplayer3-sh4/writer/h263.cpp diff --git a/libeplayer3/writer/h264.cpp b/libeplayer3-sh4/writer/h264.cpp similarity index 100% rename from libeplayer3/writer/h264.cpp rename to libeplayer3-sh4/writer/h264.cpp diff --git a/libeplayer3/writer/misc.cpp b/libeplayer3-sh4/writer/misc.cpp similarity index 100% rename from libeplayer3/writer/misc.cpp rename to libeplayer3-sh4/writer/misc.cpp diff --git a/libeplayer3/writer/mp3.cpp b/libeplayer3-sh4/writer/mp3.cpp similarity index 100% rename from libeplayer3/writer/mp3.cpp rename to libeplayer3-sh4/writer/mp3.cpp diff --git a/libeplayer3/writer/mpeg2.cpp b/libeplayer3-sh4/writer/mpeg2.cpp similarity index 100% rename from libeplayer3/writer/mpeg2.cpp rename to libeplayer3-sh4/writer/mpeg2.cpp diff --git a/libeplayer3/writer/pcm.cpp b/libeplayer3-sh4/writer/pcm.cpp similarity index 100% rename from libeplayer3/writer/pcm.cpp rename to libeplayer3-sh4/writer/pcm.cpp diff --git a/libeplayer3/writer/pes.cpp b/libeplayer3-sh4/writer/pes.cpp similarity index 100% rename from libeplayer3/writer/pes.cpp rename to libeplayer3-sh4/writer/pes.cpp diff --git a/libeplayer3/writer/vc1.cpp b/libeplayer3-sh4/writer/vc1.cpp similarity index 100% rename from libeplayer3/writer/vc1.cpp rename to libeplayer3-sh4/writer/vc1.cpp diff --git a/libeplayer3/writer/wmv.cpp b/libeplayer3-sh4/writer/wmv.cpp similarity index 100% rename from libeplayer3/writer/wmv.cpp rename to libeplayer3-sh4/writer/wmv.cpp diff --git a/libeplayer3/writer/writer.cpp b/libeplayer3-sh4/writer/writer.cpp similarity index 100% rename from libeplayer3/writer/writer.cpp rename to libeplayer3-sh4/writer/writer.cpp diff --git a/generic-pc/Makefile.am b/libgeneric-pc/Makefile.am similarity index 100% rename from generic-pc/Makefile.am rename to libgeneric-pc/Makefile.am diff --git a/generic-pc/audio.cpp b/libgeneric-pc/audio.cpp similarity index 100% rename from generic-pc/audio.cpp rename to libgeneric-pc/audio.cpp diff --git a/generic-pc/audio_lib.h b/libgeneric-pc/audio_lib.h similarity index 100% rename from generic-pc/audio_lib.h rename to libgeneric-pc/audio_lib.h diff --git a/generic-pc/clutterfb.cpp b/libgeneric-pc/clutterfb.cpp similarity index 100% rename from generic-pc/clutterfb.cpp rename to libgeneric-pc/clutterfb.cpp diff --git a/generic-pc/dmx.cpp b/libgeneric-pc/dmx.cpp similarity index 100% rename from generic-pc/dmx.cpp rename to libgeneric-pc/dmx.cpp diff --git a/generic-pc/glfb.cpp b/libgeneric-pc/glfb.cpp similarity index 100% rename from generic-pc/glfb.cpp rename to libgeneric-pc/glfb.cpp diff --git a/generic-pc/glfb_priv.h b/libgeneric-pc/glfb_priv.h similarity index 100% rename from generic-pc/glfb_priv.h rename to libgeneric-pc/glfb_priv.h diff --git a/generic-pc/hardware_caps.c b/libgeneric-pc/hardware_caps.c similarity index 100% rename from generic-pc/hardware_caps.c rename to libgeneric-pc/hardware_caps.c diff --git a/generic-pc/init.cpp b/libgeneric-pc/init.cpp similarity index 98% rename from generic-pc/init.cpp rename to libgeneric-pc/init.cpp index fa2a01c..6a8d89e 100644 --- a/generic-pc/init.cpp +++ b/libgeneric-pc/init.cpp @@ -2,7 +2,7 @@ #include #include -#include "init_td.h" +#include "init.h" #include "glfb.h" #include "lt_debug.h" diff --git a/generic-pc/playback.cpp b/libgeneric-pc/playback.cpp similarity index 99% rename from generic-pc/playback.cpp rename to libgeneric-pc/playback.cpp index 5e9c4ac..fe5a7e7 100644 --- a/generic-pc/playback.cpp +++ b/libgeneric-pc/playback.cpp @@ -1,6 +1,6 @@ #include -#include "playback.h" +#include "playback_lib.h" static const char * FILENAME = "playback-dummy"; diff --git a/generic-pc/playback_gst.h b/libgeneric-pc/playback_gst.h similarity index 100% rename from generic-pc/playback_gst.h rename to libgeneric-pc/playback_gst.h diff --git a/generic-pc/playback_gst_01.cpp b/libgeneric-pc/playback_gst_01.cpp similarity index 100% rename from generic-pc/playback_gst_01.cpp rename to libgeneric-pc/playback_gst_01.cpp diff --git a/generic-pc/playback_gst_10.cpp b/libgeneric-pc/playback_gst_10.cpp similarity index 100% rename from generic-pc/playback_gst_10.cpp rename to libgeneric-pc/playback_gst_10.cpp diff --git a/generic-pc/playback.h b/libgeneric-pc/playback_lib.h similarity index 100% rename from generic-pc/playback.h rename to libgeneric-pc/playback_lib.h diff --git a/generic-pc/record.cpp b/libgeneric-pc/record.cpp similarity index 100% rename from generic-pc/record.cpp rename to libgeneric-pc/record.cpp diff --git a/generic-pc/record_lib.h b/libgeneric-pc/record_lib.h similarity index 100% rename from generic-pc/record_lib.h rename to libgeneric-pc/record_lib.h diff --git a/generic-pc/video.cpp b/libgeneric-pc/video.cpp similarity index 100% rename from generic-pc/video.cpp rename to libgeneric-pc/video.cpp diff --git a/generic-pc/video_lib.h b/libgeneric-pc/video_lib.h similarity index 100% rename from generic-pc/video_lib.h rename to libgeneric-pc/video_lib.h diff --git a/raspi/Makefile.am b/libraspi/Makefile.am similarity index 100% rename from raspi/Makefile.am rename to libraspi/Makefile.am diff --git a/raspi/audio.cpp b/libraspi/audio.cpp similarity index 100% rename from raspi/audio.cpp rename to libraspi/audio.cpp diff --git a/raspi/audio_lib.h b/libraspi/audio_lib.h similarity index 100% rename from raspi/audio_lib.h rename to libraspi/audio_lib.h diff --git a/raspi/dmx.cpp b/libraspi/dmx.cpp similarity index 99% rename from raspi/dmx.cpp rename to libraspi/dmx.cpp index 0858a47..e09ecbc 100644 --- a/raspi/dmx.cpp +++ b/libraspi/dmx.cpp @@ -32,7 +32,7 @@ #include #include #include -#include "dmx_hal.h" +#include "dmx_lib.h" #include "lt_debug.h" #include "video_lib.h" diff --git a/raspi/dmx_lib.h b/libraspi/dmx_lib.h similarity index 100% rename from raspi/dmx_lib.h rename to libraspi/dmx_lib.h diff --git a/raspi/glfb.cpp b/libraspi/glfb.cpp similarity index 100% rename from raspi/glfb.cpp rename to libraspi/glfb.cpp diff --git a/raspi/glfb.h b/libraspi/glfb.h similarity index 100% rename from raspi/glfb.h rename to libraspi/glfb.h diff --git a/raspi/hardware_caps.c b/libraspi/hardware_caps.c similarity index 100% rename from raspi/hardware_caps.c rename to libraspi/hardware_caps.c diff --git a/raspi/init.cpp b/libraspi/init.cpp similarity index 99% rename from raspi/init.cpp rename to libraspi/init.cpp index 47f6d9e..20809c6 100644 --- a/raspi/init.cpp +++ b/libraspi/init.cpp @@ -34,7 +34,7 @@ #include #include -#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) diff --git a/libraspi/playback.cpp b/libraspi/playback.cpp new file mode 120000 index 0000000..1d16e59 --- /dev/null +++ b/libraspi/playback.cpp @@ -0,0 +1 @@ +../libgeneric-pc/playback.cpp \ No newline at end of file diff --git a/libraspi/playback_lib.h b/libraspi/playback_lib.h new file mode 120000 index 0000000..d6dd7e5 --- /dev/null +++ b/libraspi/playback_lib.h @@ -0,0 +1 @@ +../libgeneric-pc/playback_lib.h \ No newline at end of file diff --git a/raspi/record.cpp b/libraspi/record.cpp similarity index 100% rename from raspi/record.cpp rename to libraspi/record.cpp diff --git a/raspi/record_lib.h b/libraspi/record_lib.h similarity index 100% rename from raspi/record_lib.h rename to libraspi/record_lib.h diff --git a/raspi/video.cpp b/libraspi/video.cpp similarity index 100% rename from raspi/video.cpp rename to libraspi/video.cpp diff --git a/raspi/video_lib.h b/libraspi/video_lib.h similarity index 100% rename from raspi/video_lib.h rename to libraspi/video_lib.h diff --git a/libspark/Makefile.am b/libspark/Makefile.am index 74f9837..50efca9 100644 --- a/libspark/Makefile.am +++ b/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 = \ diff --git a/libspark/init.cpp b/libspark/init.cpp index cea952f..0c3e92a 100644 --- a/libspark/init.cpp +++ b/libspark/init.cpp @@ -13,7 +13,7 @@ #include -#include "init_td.h" +#include "init.h" #include "pwrmngr.h" #include "lt_debug.h" diff --git a/libtest.cpp b/libtest.cpp index b66024b..d8ecce4 100644 --- a/libtest.cpp +++ b/libtest.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #if HAVE_GENERIC_HARDWARE #include diff --git a/libtriple/init_td.cpp b/libtriple/init_td.cpp index 8015839..4500400 100644 --- a/libtriple/init_td.cpp +++ b/libtriple/init_td.cpp @@ -1,6 +1,6 @@ #include -#include "init_td.h" +#include "init.h" #include #include #include diff --git a/libtriple/playback.h b/libtriple/playback.h deleted file mode 100644 index 6e6b4c5..0000000 --- a/libtriple/playback.h +++ /dev/null @@ -1 +0,0 @@ -#include "playback_td.h" diff --git a/raspi/dmx_cs.h b/raspi/dmx_cs.h deleted file mode 100644 index 175d8cb..0000000 --- a/raspi/dmx_cs.h +++ /dev/null @@ -1 +0,0 @@ -#include "dmx_lib.h" diff --git a/raspi/playback.cpp b/raspi/playback.cpp deleted file mode 120000 index d2e1498..0000000 --- a/raspi/playback.cpp +++ /dev/null @@ -1 +0,0 @@ -../generic-pc/playback.cpp \ No newline at end of file diff --git a/raspi/playback.h b/raspi/playback.h deleted file mode 120000 index 1363d92..0000000 --- a/raspi/playback.h +++ /dev/null @@ -1 +0,0 @@ -../generic-pc/playback.h \ No newline at end of file