diff options
Diffstat (limited to 'upnpcomponents')
| -rw-r--r-- | upnpcomponents/dlna.cpp | 26 | ||||
| -rw-r--r-- | upnpcomponents/dlna.h | 33 | ||||
| -rw-r--r-- | upnpcomponents/upnpwebserver.cpp | 4 |
3 files changed, 2 insertions, 61 deletions
diff --git a/upnpcomponents/dlna.cpp b/upnpcomponents/dlna.cpp index 27f84f2..c8bb8a9 100644 --- a/upnpcomponents/dlna.cpp +++ b/upnpcomponents/dlna.cpp @@ -69,32 +69,6 @@ const char* cDlna::getProtocolInfo(DLNAProfile *Prof){ return NULL; } -DLNAProfile* cDlna::getProfileOfChannel(cChannel* Channel){ - if(Channel == NULL) return NULL; - // Switching the video types of the DVB-Stream - switch(Channel->Vtype()){ - case 0x02: - // MPEG2 Video - return &DLNA_PROFILE_MPEG_TS_SD_EU_ISO; - case 0x1B: - return &DLNA_PROFILE_AVC_TS_HD_EU_ISO; - default: - ERROR("Unknown video type %d for channel %s!", Channel->Vtype(), Channel->Name()); - return NULL; - } -} - -DLNAProfile* cDlna::getProfileOfRecording(cRecording* Recording){ - // Get the data of the first file of the recording - cString File = cString::sprintf(VDR_RECORDFILE_PATTERN_TS, Recording->FileName(), 1); - return this->getProfileOfFile(File); -} - -DLNAProfile* cDlna::getProfileOfFile(cString){ - WARNING("Not yet supported"); - return NULL; -} - const char* cDlna::getRegisteredProtocolInfoString(cRegisteredProfile *Profile){ cString DLNA4thField = NULL; DLNA4thField = cString::sprintf("DLNA.ORG_PN=%s", Profile->Profile->ID); diff --git a/upnpcomponents/dlna.h b/upnpcomponents/dlna.h index 80ac328..44ed3c4 100644 --- a/upnpcomponents/dlna.h +++ b/upnpcomponents/dlna.h @@ -105,39 +105,6 @@ public: const char* getProtocolInfo( DLNAProfile *Prof ///< the Profile of which the protocol info shall be returned ); - /** - * Profile of a channel - * - * Returns the DLNA profile of a VDR channel. It checks the video type to determine - * which profile will match. - * - * @return the matching DLNA profile - */ - DLNAProfile* getProfileOfChannel( - cChannel* Channel ///< the channel of which the profile should created from - ); - /** - * Profile of a recording - * - * Returns the DLNA profile of a VDR recording. It checks the video file to determine - * which profile will match. - * - * @return the matching DLNA profile - */ - DLNAProfile* getProfileOfRecording( - cRecording* Recording ///< the recording of which the profile should be created from - ); - /** - * Profile of a file - * - * Returns the DLNA profile of a file. It checks the content of the file with \em ffmpeg to - * determine which profile will match. - * - * @return the matching DLNA profile - */ - DLNAProfile* getProfileOfFile( - cString File ///< the file of which the profile should be created from - ); private: const char* getRegisteredProtocolInfoString(cRegisteredProfile *Profile); cDlna(); diff --git a/upnpcomponents/upnpwebserver.cpp b/upnpcomponents/upnpwebserver.cpp index 892f5b1..b192cd9 100644 --- a/upnpcomponents/upnpwebserver.cpp +++ b/upnpcomponents/upnpwebserver.cpp @@ -259,8 +259,8 @@ UpnpWebFileHandle cUPnPWebServer::open(const char* filename, UpnpOpenFileMode mo case UPNP_RESOURCE_CHANNEL: { char* ChannelID = strtok(strdup(Resource->getResource()),":"); - int AudioID = atoi(strtok(NULL,":")); - MESSAGE(VERBOSE_LIVE_TV, "Try to create Receiver for Channel %s with Audio ID %d", ChannelID, AudioID); + int StreamID = atoi(strtok(NULL,":")); + MESSAGE(VERBOSE_LIVE_TV, "Try to create Receiver for Channel %s with Stream ID %d", ChannelID, StreamID); cChannel* Channel = Channels.GetByChannelID(tChannelID::FromString(ChannelID)); if(!Channel){ ERROR("No such channel with ID %s", ChannelID); |