cleanup grayout handling in servicelist.. so no more grayout in timeout channelselect...

[enigma2.git] / lib / service / iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index e27752a2395ebeb349e56c483425040edd5fbf4c..c477f11db41b4e433d4a3a8fcb0b6fcac44e5352 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -138,6 +138,10 @@ public:
                data[3]=data3;
                data[4]=data4;
        }
                data[3]=data3;
                data[4]=data4;
        }

+       operator bool() const
+       {
+               return valid();
+       }

 #endif
        eServiceReference(int type, int flags, const std::string &path)
                : type(type), flags(flags), path(path)
 #endif
        eServiceReference(int type, int flags, const std::string &path)
                : type(type), flags(flags), path(path)


@@ -170,10 +174,6 @@ public:
                        return r < 0;
                return path < c.path;
        }
                        return r < 0;
                return path < c.path;
        }

-       operator bool() const
-       {
-               return valid();
-       }

        
        int valid() const
        {
        
        int valid() const
        {


@@ -286,13 +286,8 @@ public:
                sDescription,
                sServiceref,
                sTimeCreate,            /* unix time or string */
                sDescription,
                sServiceref,
                sTimeCreate,            /* unix time or string */

+               sFileSize,

 
 

-               sTitle,
-               sArtist,
-               sAlbum,
-               sComment,
-               sTracknumber,
-               sGenre,

                sCAIDs,
                sVideoType,             /* MPEG2 MPEG4 */
 
                sCAIDs,
                sVideoType,             /* MPEG2 MPEG4 */
 


@@ -310,6 +305,57 @@ public:
                sTotalChapters,
                sTotalTitles,
 
                sTotalChapters,
                sTotalTitles,
 

+               sTagTitle,
+               sTagTitleSortname,
+               sTagArtist,
+               sTagArtistSortname,
+               sTagAlbum,
+               sTagAlbumSortname,
+               sTagComposer,
+               sTagDate,
+               sTagGenre,
+               sTagComment,
+               sTagExtendedComment,
+               sTagTrackNumber,
+               sTagTrackCount,
+               sTagAlbumVolumeNumber,
+               sTagAlbumVolumeCount,
+               sTagLocation,
+               sTagHomepage,
+               sTagDescription,
+               sTagVersion,
+               sTagISRC,
+               sTagOrganization,
+               sTagCopyright,
+               sTagCopyrightURI,
+               sTagContact,
+               sTagLicense,
+               sTagLicenseURI,
+               sTagPerformer,
+               sTagCodec,
+               sTagVideoCodec,
+               sTagAudioCodec,
+               sTagBitrate,
+               sTagNominalBitrate,
+               sTagMinimumBitrate,
+               sTagMaximumBitrate,
+               sTagSerial,
+               sTagEncoder,
+               sTagEncoderVersion,
+               sTagTrackGain,
+               sTagTrackPeak,
+               sTagAlbumGain,
+               sTagAlbumPeak,
+               sTagReferenceLevel,
+               sTagLanguageCode,
+               sTagImage,
+               sTagPreviewImage,
+               sTagAttachment,
+               sTagBeatsPerMinute,
+               sTagKeywords,
+               sTagCRC,
+               sTagChannelMode,
+

                sUser = 0x100
        };
        enum {
                sUser = 0x100
        };
        enum {


@@ -673,6 +719,9 @@ public:
 
                /* for transferring a service... */
        virtual SWIG_VOID(RESULT) getListOfFilenames(std::list<std::string> &SWIG_OUTPUT)=0;
 
                /* for transferring a service... */
        virtual SWIG_VOID(RESULT) getListOfFilenames(std::list<std::string> &SWIG_OUTPUT)=0;

+       
+               /* a blocking call to reindex a file */
+       virtual int reindex() = 0;

 
                // TODO: additional stuff, like a conversion interface?
 };
 
                // TODO: additional stuff, like a conversion interface?
 };


@@ -697,6 +746,19 @@ public:
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iStreamableService>, iStreamableServicePtr);
 
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iStreamableService>, iStreamableServicePtr);
 

+SWIG_IGNORE(iStreamedService);
+class iStreamedService: public iObject
+{
+#ifdef SWIG
+       iStreamedService();
+       ~iStreamedService();
+#endif
+public:
+       virtual PyObject *getBufferCharge()=0;
+       virtual int setBufferSize(int size)=0;
+};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iStreamedService>, iStreamedServicePtr);
+

 class iServiceKeys_ENUMS
 {
 #ifdef SWIG
 class iServiceKeys_ENUMS
 {
 #ifdef SWIG


@@ -767,6 +829,8 @@ public:
                evVideoFramerateChanged,
                evVideoProgressiveChanged,
 
                evVideoFramerateChanged,
                evVideoProgressiveChanged,
 

+               evBuffering,
+

                evStopped,
 
                evUser = 0x100
                evStopped,
 
                evUser = 0x100


@@ -802,6 +866,7 @@ public:
        virtual SWIG_VOID(RESULT) audioDelay(ePtr<iAudioDelay> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) rdsDecoder(ePtr<iRdsDecoder> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) stream(ePtr<iStreamableService> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) audioDelay(ePtr<iAudioDelay> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) rdsDecoder(ePtr<iRdsDecoder> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) stream(ePtr<iStreamableService> &SWIG_OUTPUT)=0;

+       virtual SWIG_VOID(RESULT) streamed(ePtr<iStreamedService> &SWIG_OUTPUT)=0;

        virtual SWIG_VOID(RESULT) keys(ePtr<iServiceKeys> &SWIG_OUTPUT)=0;
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
        virtual SWIG_VOID(RESULT) keys(ePtr<iServiceKeys> &SWIG_OUTPUT)=0;
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);


@@ -822,7 +887,8 @@ public:
                evRecordStopped,
                evNewProgramInfo,
                evRecordFailed,
                evRecordStopped,
                evNewProgramInfo,
                evRecordFailed,

-               evRecordWriteError
+               evRecordWriteError,
+               evNewEventInfo

        };
        enum {
                NoError=0,
        };
        enum {
                NoError=0,


@@ -848,12 +914,13 @@ public:
        virtual RESULT connectEvent(const Slot2<void,iRecordableService*,int> &event, ePtr<eConnection> &connection)=0;
 #endif
        virtual SWIG_VOID(RESULT) getError(int &SWIG_OUTPUT)=0;
        virtual RESULT connectEvent(const Slot2<void,iRecordableService*,int> &event, ePtr<eConnection> &connection)=0;
 #endif
        virtual SWIG_VOID(RESULT) getError(int &SWIG_OUTPUT)=0;

-       virtual RESULT prepare(const char *filename, time_t begTime=-1, time_t endTime=-1, int eit_event_id=-1)=0;
+       virtual RESULT prepare(const char *filename, time_t begTime=-1, time_t endTime=-1, int eit_event_id=-1, const char *name=0, const char *descr=0, const char *tags=0)=0;

        virtual RESULT prepareStreaming()=0;
        virtual RESULT start(bool simulate=false)=0;
        virtual RESULT stop()=0;
        virtual SWIG_VOID(RESULT) frontendInfo(ePtr<iFrontendInformation> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) stream(ePtr<iStreamableService> &SWIG_OUTPUT)=0;
        virtual RESULT prepareStreaming()=0;
        virtual RESULT start(bool simulate=false)=0;
        virtual RESULT stop()=0;
        virtual SWIG_VOID(RESULT) frontendInfo(ePtr<iFrontendInformation> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) stream(ePtr<iStreamableService> &SWIG_OUTPUT)=0;

+       virtual SWIG_VOID(RESULT) subServices(ePtr<iSubserviceList> &SWIG_OUTPUT)=0;

 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);
 
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);