Attachment #400086 for bug #545002




LIB_DIRS=\
	lib/cximage-6.0 \
	lib/libexif \
	lib/libhdhomerun \
	lib/cpluff \
	lib/xbmc-dll-symbols


	$(MAKE) -C lib/libexif
cmyth: dllloader
	$(MAKE) -C lib/cmyth
libhdhomerun: dllloader
	$(MAKE) -C lib/libhdhomerun
papcodecs: dllloader dvdpcodecs
	test -d system/players/paplayer || mkdir system/players/paplayer
	$(MAKE) -C lib/vgmstream


codecs: papcodecs dvdpcodecs dvdpextcodecs

libs: $(LIBSSE4) imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)

externals: codecs libs visualizations screensavers libaddon pvraddons


Lines 1246-1251 Link Here

(-)xbmc-14.1-Helix.orig/configure.in (-1 / +1 lines)
1246	XB_FIND_SONAME([MODPLUG], [modplug])	1246	XB_FIND_SONAME([MODPLUG], [modplug])
1247	XB_FIND_SONAME([ASS], [ass])	1247	XB_FIND_SONAME([ASS], [ass])
1248	XB_FIND_SONAME([MPEG2], [mpeg2])	1248	XB_FIND_SONAME([MPEG2], [mpeg2])
		1249	XB_FIND_SONAME([HDHOMERUN], [hdhomerun])
1249	XB_FIND_SONAME([SIDPLAY2], [sidplay2])	1250	XB_FIND_SONAME([SIDPLAY2], [sidplay2])
1250		1251
1251	# WebServer	1252	# WebServer
Lines 2467-2473 Link Here
2467	lib/libexif/Makefile \	2468	lib/libexif/Makefile \
2468	lib/libXDAAP/Makefile \	2469	lib/libXDAAP/Makefile \
2469	lib/cmyth/Makefile \	2470	lib/cmyth/Makefile \
2470	lib/libhdhomerun/Makefile \
2471	lib/libsquish/Makefile \	2471	lib/libsquish/Makefile \
2472	lib/cximage-6.0/Makefile \	2472	lib/cximage-6.0/Makefile \
2473	lib/libUPnP/Makefile \	2473	lib/libUPnP/Makefile \

Lines 28-34 Link Here

(-)xbmc-14.1-Helix.orig/xbmc/DllPaths_generated.h.in (-1 / +1 lines)
28	#define DLL_PATH_CPLUFF "special://xbmcbin/system/libcpluff-@ARCH@.so"	28	#define DLL_PATH_CPLUFF "special://xbmcbin/system/libcpluff-@ARCH@.so"
29	#define DLL_PATH_IMAGELIB "special://xbmcbin/system/ImageLib-@ARCH@.so"	29	#define DLL_PATH_IMAGELIB "special://xbmcbin/system/ImageLib-@ARCH@.so"
30	#define DLL_PATH_LIBEXIF "special://xbmcbin/system/libexif-@ARCH@.so"	30	#define DLL_PATH_LIBEXIF "special://xbmcbin/system/libexif-@ARCH@.so"
31	#define DLL_PATH_LIBHDHOMERUN "special://xbmcbin/system/hdhomerun-@ARCH@.so"	31	#define DLL_PATH_LIBHDHOMERUN "@HDHOMERUN_SONAME@"
32	#define DLL_PATH_MEDIAINFO "special://xbmcbin/system/mediainfo-@ARCH@.so"	32	#define DLL_PATH_MEDIAINFO "special://xbmcbin/system/mediainfo-@ARCH@.so"
33	#define DLL_PATH_LIBCMYTH "special://xbmcbin/system/libcmyth-@ARCH@.so"	33	#define DLL_PATH_LIBCMYTH "special://xbmcbin/system/libcmyth-@ARCH@.so"
34		34




 */

#include "DynamicDll.h"
#include <hdhomerun/hdhomerun.h>

class DllHdHomeRunInterface
{


class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
{
  virtual ~DllHdHomeRun () {};

  virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
    { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }

  virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2)
    { return ::hdhomerun_device_create_from_str (p1, p2); }

  virtual void device_destroy (struct hdhomerun_device_t* p1)
    { ::hdhomerun_device_destroy (p1); }

  virtual int device_stream_start (struct hdhomerun_device_t* p1)
    { return ::hdhomerun_device_stream_start (p1); }


  virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, size_t p2, size_t* p3)
    { 
      uint8_t *retval;

      size_t tmp = *p3;
      retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
      *p3 = tmp;

      return retval;
    }

  virtual void device_stream_stop (struct hdhomerun_device_t* p1)
    { ::hdhomerun_device_stream_stop (p1); }

  virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2)
    { return ::hdhomerun_device_set_tuner_channel (p1, p2); }

  virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2)
    { return ::hdhomerun_device_set_tuner_program (p1, p2); }


  virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2)
    { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }


  virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
    { ::hdhomerun_device_set_tuner (p1, p2); }

  virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)
    { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }

  // DLL faking.
  virtual bool ResolveExports() { return true; }
  virtual bool Load() { return true; }
  virtual void Unload() {}
};


Return to bug 545002

Lines 203-209 Link Here

(-)xbmc-14.1-Helix.orig/Makefile.in (-4 / +1 lines)
203	LIB_DIRS=\	203	LIB_DIRS=\
204	lib/cximage-6.0 \	204	lib/cximage-6.0 \
205	lib/libexif \	205	lib/libexif \
206	lib/libhdhomerun \
207	lib/cpluff \	206	lib/cpluff \
208	lib/xbmc-dll-symbols	207	lib/xbmc-dll-symbols
209		208
Lines 424-431 Link Here
424	$(MAKE) -C lib/libexif	423	$(MAKE) -C lib/libexif
425	cmyth: dllloader	424	cmyth: dllloader
426	$(MAKE) -C lib/cmyth	425	$(MAKE) -C lib/cmyth
427	libhdhomerun: dllloader
428	$(MAKE) -C lib/libhdhomerun
429	papcodecs: dllloader dvdpcodecs	426	papcodecs: dllloader dvdpcodecs
430	test -d system/players/paplayer \|\| mkdir system/players/paplayer	427	test -d system/players/paplayer \|\| mkdir system/players/paplayer
431	$(MAKE) -C lib/vgmstream	428	$(MAKE) -C lib/vgmstream
Lines 453-459 Link Here
453		450
454	codecs: papcodecs dvdpcodecs dvdpextcodecs	451	codecs: papcodecs dvdpcodecs dvdpextcodecs
455		452
456	libs: $(LIBSSE4) libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)	453	libs: $(LIBSSE4) imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
457		454
458	externals: codecs libs visualizations screensavers libaddon pvraddons	455	externals: codecs libs visualizations screensavers libaddon pvraddons
459		456

Lines 20-26 Link Here

(-)xbmc-14.1-Helix.orig/xbmc/filesystem/DllHDHomeRun.h (-26 / +51 lines)
20	*/	20	*/
21		21
22	#include "DynamicDll.h"	22	#include "DynamicDll.h"
23	#include "lib/libhdhomerun/hdhomerun.h"	23	#include <hdhomerun/hdhomerun.h>
24		24
25	class DllHdHomeRunInterface	25	class DllHdHomeRunInterface
26	{	26	{
Lines 41-70 Link Here
41		41
42	class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface	42	class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
43	{	43	{
44	DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)	44	virtual ~DllHdHomeRun () {};
45	DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))	45
46	DEFINE_METHOD2(struct hdhomerun_device_t, device_create_from_str, (const char p1, struct hdhomerun_debug_t *p2))	46	virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
47	DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))	47	{ return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
48	DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))	48
49	DEFINE_METHOD3(uint8_t, device_stream_recv, (struct hdhomerun_device_t p1, size_t p2, size_t* p3))	49	virtual struct hdhomerun_device_t device_create_from_str (const char p1, struct hdhomerun_debug_t *p2)
50	DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))	50	{ return ::hdhomerun_device_create_from_str (p1, p2); }
51	DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t p1, const char p2))	51
52	DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t p1, const char p2))	52	virtual void device_destroy (struct hdhomerun_device_t* p1)
53	DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t p1, const char p2))	53	{ ::hdhomerun_device_destroy (p1); }
54	DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2))	54
55	DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t p1, char p2, struct hdhomerun_tuner_status_t p3));	55	virtual int device_stream_start (struct hdhomerun_device_t* p1)
56	BEGIN_METHOD_RESOLVE()	56	{ return ::hdhomerun_device_stream_start (p1); }
57	RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom)	57
58	RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str)	58
59	RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)	59	virtual uint8_t device_stream_recv (struct hdhomerun_device_t p1, size_t p2, size_t* p3)
60	RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)	60	{
61	RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)	61	uint8_t *retval;
62	RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)	62
63	RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel)	63	size_t tmp = *p3;
64	RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program)	64	retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
65	RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str)	65	*p3 = tmp;
66	RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)	66
67	RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status)	67	return retval;
68	END_METHOD_RESOLVE()	68	}
		69
		70	virtual void device_stream_stop (struct hdhomerun_device_t* p1)
		71	{ ::hdhomerun_device_stream_stop (p1); }
		72
		73	virtual int device_set_tuner_channel (struct hdhomerun_device_t p1, const char p2)
		74	{ return ::hdhomerun_device_set_tuner_channel (p1, p2); }
		75
		76	virtual int device_set_tuner_program (struct hdhomerun_device_t p1, const char p2)
		77	{ return ::hdhomerun_device_set_tuner_program (p1, p2); }
		78
		79
		80	virtual int device_set_tuner_from_str (struct hdhomerun_device_t p1, const char p2)
		81	{ return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
		82
		83
		84	virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
		85	{ ::hdhomerun_device_set_tuner (p1, p2); }
		86
		87	virtual int device_get_tuner_status (struct hdhomerun_device_t p1, char p2, struct hdhomerun_tuner_status_t p3)
		88	{ return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
		89
		90	// DLL faking.
		91	virtual bool ResolveExports() { return true; }
		92	virtual bool Load() { return true; }
		93	virtual void Unload() {}
69	};	94	};
70		95