Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

split up the pvr and epg types.h. less verbose installing

  • Loading branch information...
commit 2d4a94734d205f416bbd357043591a21dc45bea7 1 parent 2dc91f2
@opdenkamp authored
View
1  Makefile.am
@@ -16,6 +16,7 @@ sync:
cp -f ../xbmc/addons/include/xbmc_addon_cpp_dll.h xbmc/xbmc_addon_cpp_dll.h
cp -f ../xbmc/addons/include/xbmc_addon_dll.h xbmc/xbmc_addon_dll.h
cp -f ../xbmc/addons/include/xbmc_addon_types.h xbmc/xbmc_addon_types.h
+ cp -f ../xbmc/addons/include/xbmc_epg_types.h xbmc/xbmc_epg_types.h
cp -f ../xbmc/addons/include/xbmc_pvr_dll.h xbmc/xbmc_pvr_dll.h
cp -f ../xbmc/addons/include/xbmc_pvr_types.h xbmc/xbmc_pvr_types.h
cp -f ../xbmc/addons/include/xbmc_scr_dll.h xbmc/xbmc_scr_dll.h
View
10 addons/Makefile.include.am
@@ -13,23 +13,23 @@ clean:
-rm -r -f $(LIB) $(ADDONBINNAME).pvr @abs_top_srcdir@/addons/$(ADDONNAME).@OS@-@ARCHITECTURE@.zip @abs_top_srcdir@/addons/.build/$(ADDONNAME) *.so *.lo *.o *.la *.a *.P *~
release: $(lib_LTLIBRARIES)
- cp -f -v .libs/$(LIBNAME).so $(ADDONBINNAME).pvr
+ cp -f .libs/$(LIBNAME).so $(ADDONBINNAME).pvr
$(STRIP) -x $(ADDONBINNAME).pvr
debug: $(lib_LTLIBRARIES)
- cp -f -v .libs/$(LIBNAME).so $(ADDONBINNAME).pvr
+ cp -f .libs/$(LIBNAME).so $(ADDONBINNAME).pvr
$(LIB): @BUILD_TYPE@
- cp -f -v $(ADDONBINNAME).pvr $(LIB)
+ cp -f $(ADDONBINNAME).pvr $(LIB)
zip: $(LIB)
mkdir -p @abs_top_srcdir@/addons/.build
- cp -r -f -v @abs_top_srcdir@/addons/$(ADDONNAME)/addon @abs_top_srcdir@/addons/.build/$(ADDONNAME)
+ cp -r -f @abs_top_srcdir@/addons/$(ADDONNAME)/addon @abs_top_srcdir@/addons/.build/$(ADDONNAME)
cd @abs_top_srcdir@/addons/.build ; zip -9 -r @abs_top_srcdir@/addons/$(ADDONNAME)-@OS@-@ARCHITECTURE@.zip $(ADDONNAME)
install: $(LIB)
mkdir -p $(prefix)
- cp -r -f -v @abs_top_srcdir@/addons/$(ADDONNAME)/addon $(prefix)/$(ADDONNAME)
+ cp -r -f @abs_top_srcdir@/addons/$(ADDONNAME)/addon $(prefix)/$(ADDONNAME)
all: $(LIB)
View
4 addons/pvr.hts/src/client.cpp
@@ -288,12 +288,8 @@ PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES* pCapabilities)
pCapabilities->bSupportsRecordings = true;
pCapabilities->bSupportsTimers = true;
pCapabilities->bSupportsChannelGroups = true;
- pCapabilities->bSupportsChannelScan = false;
pCapabilities->bHandlesInputStream = true;
pCapabilities->bHandlesDemuxing = true;
- pCapabilities->bSupportsLastPlayedPosition = false;
- pCapabilities->bSupportsRecordingFolders = false;
- pCapabilities->bSupportsRecordingPlayCount = false;
return PVR_ERROR_NO_ERROR;
}
View
94 xbmc/xbmc_epg_types.h
@@ -0,0 +1,94 @@
+#pragma once
+/*
+ * Copyright (C) 2005-2012 Team XBMC
+ * http://www.xbmc.org
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with XBMC; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <string.h>
+#include <time.h>
+
+#undef ATTRIBUTE_PACKED
+#undef PRAGMA_PACK_BEGIN
+#undef PRAGMA_PACK_END
+
+#if defined(__GNUC__)
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+#define ATTRIBUTE_PACKED __attribute__ ((packed))
+#define PRAGMA_PACK 0
+#endif
+#endif
+
+#if !defined(ATTRIBUTE_PACKED)
+#define ATTRIBUTE_PACKED
+#define PRAGMA_PACK 1
+#endif
+
+//@{
+/* These IDs come from the DVB-SI EIT table "content descriptor"
+ * Also known under the name "E-book genre assignments"
+ */
+#define EPG_EVENT_CONTENTMASK_UNDEFINED 0x00
+#define EPG_EVENT_CONTENTMASK_MOVIEDRAMA 0x10
+#define EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS 0x20
+#define EPG_EVENT_CONTENTMASK_SHOW 0x30
+#define EPG_EVENT_CONTENTMASK_SPORTS 0x40
+#define EPG_EVENT_CONTENTMASK_CHILDRENYOUTH 0x50
+#define EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE 0x60
+#define EPG_EVENT_CONTENTMASK_ARTSCULTURE 0x70
+#define EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS 0x80
+#define EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE 0x90
+#define EPG_EVENT_CONTENTMASK_LEISUREHOBBIES 0xA0
+#define EPG_EVENT_CONTENTMASK_SPECIAL 0xB0
+#define EPG_EVENT_CONTENTMASK_USERDEFINED 0xF0
+//@}
+/* Set EPGTAG.iGenreType to EPG_GENRE_USE_STRING to transfer genre strings to XBMC */
+#define EPG_GENRE_USE_STRING 0x100
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ /*!
+ * @brief Representation of an EPG event.
+ */
+ typedef struct EPG_TAG {
+ unsigned int iUniqueBroadcastId; /*!< @brief (required) identifier for this event */
+ const char * strTitle; /*!< @brief (required) this event's title */
+ unsigned int iChannelUniqueId; /*!< @brief (required) unique id of the channel */
+ time_t startTime; /*!< @brief (required) start time in UTC */
+ time_t endTime; /*!< @brief (required) end time in UTC */
+ const char * strPlotOutline; /*!< @brief (optional) plot outline */
+ const char * strPlot; /*!< @brief (optional) plot */
+ const char * strIconPath; /*!< @brief (optional) icon path */
+ int iGenreType; /*!< @brief (optional) genre type */
+ int iGenreSubType; /*!< @brief (optional) genre sub type */
+ const char * strGenreDescription; /*!< @brief (optional) genre. Will be used only when iGenreType = EPG_GENRE_USE_STRING */
+ time_t firstAired; /*!< @brief (optional) first aired in UTC */
+ int iParentalRating; /*!< @brief (optional) parental rating */
+ int iStarRating; /*!< @brief (optional) star rating */
+ bool bNotify; /*!< @brief (optional) notify the user when this event starts */
+ int iSeriesNumber; /*!< @brief (optional) series number */
+ int iEpisodeNumber; /*!< @brief (optional) episode number */
+ int iEpisodePartNumber; /*!< @brief (optional) episode part number */
+ const char * strEpisodeName; /*!< @brief (optional) episode name */
+ } ATTRIBUTE_PACKED EPG_TAG;
+
+#ifdef __cplusplus
+}
+#endif
View
48 xbmc/xbmc_pvr_types.h
@@ -37,6 +37,7 @@
#include <time.h>
#include "xbmc_addon_types.h"
+#include "xbmc_epg_types.h"
/*! @note Define "USE_DEMUX" on compile time if demuxing inside pvr
* addon is used. Also XBMC's "DVDDemuxPacket.h" file must be inside
@@ -64,28 +65,6 @@ struct DemuxPacket;
#define PRAGMA_PACK 1
#endif
-/*! @name PVR entry content event types */
-//@{
-/* These IDs come from the DVB-SI EIT table "content descriptor"
- * Also known under the name "E-book genre assignments"
- */
-#define EPG_EVENT_CONTENTMASK_UNDEFINED 0x00
-#define EPG_EVENT_CONTENTMASK_MOVIEDRAMA 0x10
-#define EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS 0x20
-#define EPG_EVENT_CONTENTMASK_SHOW 0x30
-#define EPG_EVENT_CONTENTMASK_SPORTS 0x40
-#define EPG_EVENT_CONTENTMASK_CHILDRENYOUTH 0x50
-#define EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE 0x60
-#define EPG_EVENT_CONTENTMASK_ARTSCULTURE 0x70
-#define EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS 0x80
-#define EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE 0x90
-#define EPG_EVENT_CONTENTMASK_LEISUREHOBBIES 0xA0
-#define EPG_EVENT_CONTENTMASK_SPECIAL 0xB0
-#define EPG_EVENT_CONTENTMASK_USERDEFINED 0xF0
-//@}
-/* Set EPGTAG.iGenreType to EPG_GENRE_USE_STRING to transfer genre strings to XBMC */
-#define EPG_GENRE_USE_STRING 0x100
-
/* using the default avformat's MAX_STREAMS value to be safe */
#define PVR_STREAM_MAX_STREAMS 20
@@ -245,31 +224,6 @@ extern "C" {
} ATTRIBUTE_PACKED PVR_CHANNEL_GROUP_MEMBER;
/*!
- * @brief Representation of an EPG event.
- */
- typedef struct EPG_TAG {
- unsigned int iUniqueBroadcastId; /*!< @brief (required) identifier for this event */
- const char * strTitle; /*!< @brief (required) this event's title */
- unsigned int iChannelUniqueId; /*!< @brief (required) unique id of the channel */
- time_t startTime; /*!< @brief (required) start time in UTC */
- time_t endTime; /*!< @brief (required) end time in UTC */
- const char * strPlotOutline; /*!< @brief (optional) plot outline */
- const char * strPlot; /*!< @brief (optional) plot */
- const char * strIconPath; /*!< @brief (optional) icon path */
- int iGenreType; /*!< @brief (optional) genre type */
- int iGenreSubType; /*!< @brief (optional) genre sub type */
- const char * strGenreDescription; /*!< @brief (optional) genre. Will be used only when iGenreType = EPG_GENRE_USE_STRING */
- time_t firstAired; /*!< @brief (optional) first aired in UTC */
- int iParentalRating; /*!< @brief (optional) parental rating */
- int iStarRating; /*!< @brief (optional) star rating */
- bool bNotify; /*!< @brief (optional) notify the user when this event starts */
- int iSeriesNumber; /*!< @brief (optional) series number */
- int iEpisodeNumber; /*!< @brief (optional) episode number */
- int iEpisodePartNumber; /*!< @brief (optional) episode part number */
- const char * strEpisodeName; /*!< @brief (optional) episode name */
- } ATTRIBUTE_PACKED EPG_TAG;
-
- /*!
* @brief Representation of a timer event.
*/
typedef struct PVR_TIMER {
Please sign in to comment.
Something went wrong with that request. Please try again.