diff options
| -rw-r--r-- | media/mediaManager.cpp | 4 | ||||
| -rw-r--r-- | media/pluginManager.cpp | 2 | ||||
| -rw-r--r-- | plugins/profiler/vdrDVBProfiler/dvbProfiler.cpp | 12 |
3 files changed, 11 insertions, 7 deletions
diff --git a/media/mediaManager.cpp b/media/mediaManager.cpp index 1c9eaf2..885b085 100644 --- a/media/mediaManager.cpp +++ b/media/mediaManager.cpp @@ -475,7 +475,7 @@ bool cMediaManager::Initialise(){ connection = tntdb::connect(ss.str()); - dsyslog("UPNP\tPreparing database structure..."); + dsyslog("UPnP\tPreparing database structure..."); if(!CheckIntegrity()){ try { @@ -592,7 +592,7 @@ bool cMediaManager::Initialise(){ return false; } - dsyslog("UPNP\tLoading Plugins..."); + dsyslog("UPnP\tLoading Plugins..."); pluginManager = new upnp::cPluginManager(); if(!pluginManager->LoadPlugins(pluginDirectory)){ diff --git a/media/pluginManager.cpp b/media/pluginManager.cpp index 17ce69a..38be5d4 100644 --- a/media/pluginManager.cpp +++ b/media/pluginManager.cpp @@ -405,7 +405,7 @@ bool upnp::cPluginManager::DLL::Load(){ return true; } } else { - esyslog("UPnP\tError while opening plugin: %s", error); + esyslog("UPnP\tError while opening plugin '%s': %s", file.c_str(), error); } return false; diff --git a/plugins/profiler/vdrDVBProfiler/dvbProfiler.cpp b/plugins/profiler/vdrDVBProfiler/dvbProfiler.cpp index aabbca5..51c6802 100644 --- a/plugins/profiler/vdrDVBProfiler/dvbProfiler.cpp +++ b/plugins/profiler/vdrDVBProfiler/dvbProfiler.cpp @@ -149,18 +149,22 @@ private: resource.SetResourceUri(u); resource.SetProtocolInfo(ProtocolInfo("video/mpeg", fourthfield).ToString()); - int duration = 0; + int seconds = 0; const cEvent* event = info->GetEvent(); if(event && event->Duration() > 0){ - duration = event->Duration(); + seconds = event->Duration(); } #if VDRVERSNUM > 10723 else if(recording->LengthInSeconds() > 0){ - boost::posix_time::time_duration duration = boost::posix_time::seconds(recording->LengthInSeconds()); - resource.SetDuration(boost::posix_time::to_simple_string(duration)); + seconds = recording->LengthInSeconds(); } #endif + if(seconds){ + boost::posix_time::time_duration duration = boost::posix_time::seconds(seconds); + resource.SetDuration(boost::posix_time::to_simple_string(duration)); + } + metadata.AddResource(resource); return true; |