diff options
| author | methodus <methodus@web.de> | 2012-12-30 23:22:28 +0100 |
|---|---|---|
| committer | methodus <methodus@web.de> | 2012-12-30 23:22:28 +0100 |
| commit | 0deeeb8116285491ecef1e52c23f7851383f8c86 (patch) | |
| tree | 2181e07bed63d78c26b5d9eefa595bf54fdac486 /plugins | |
| parent | b6b7de7e2ce7b66d5964003106f8ea35fb9630fd (diff) | |
| download | vdr-plugin-upnp-0deeeb8116285491ecef1e52c23f7851383f8c86.tar.gz vdr-plugin-upnp-0deeeb8116285491ecef1e52c23f7851383f8c86.tar.bz2 | |
Improved logging
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/profiler/vdrDVBProfiler/dvbProfiler.cpp | 4 | ||||
| -rw-r--r-- | plugins/provider/vdrProvider/vdrProvider.cpp | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/plugins/profiler/vdrDVBProfiler/dvbProfiler.cpp b/plugins/profiler/vdrDVBProfiler/dvbProfiler.cpp index 6820481..327d16a 100644 --- a/plugins/profiler/vdrDVBProfiler/dvbProfiler.cpp +++ b/plugins/profiler/vdrDVBProfiler/dvbProfiler.cpp @@ -138,6 +138,10 @@ public: ::cConfig<ChannelTitle> channelTitleConfig; + cCharSetConv conv; +#define TO_UTF8(from, to, length) \ + char to[length]; conv.Convert(from, to, length); + private: #if VDRVERSNUM > 10704 diff --git a/plugins/provider/vdrProvider/vdrProvider.cpp b/plugins/provider/vdrProvider/vdrProvider.cpp index 667bec9..5ab99d3 100644 --- a/plugins/provider/vdrProvider/vdrProvider.cpp +++ b/plugins/provider/vdrProvider/vdrProvider.cpp @@ -66,6 +66,10 @@ private: cCondWait sleep; + cCharSetConv conv; +#define TO_UTF8(from, to, length) \ + char to[length]; conv.Convert(from, to, length); + public: VdrProvider() @@ -113,7 +117,8 @@ public: } } else { for(index = Channels.GetNextGroup(from - 1); (channel = Channels.Get(index)) && index < to; index = Channels.GetNextGroup(index)){ - string group = string(channel->Name()) + '/'; + TO_UTF8(channel->Name(), chanName, 1024); + string group = string(chanName) + '/'; list.push_back(group); } } @@ -149,8 +154,9 @@ public: metadata.SetProperty(cMetadata::Property(property::object::KEY_TITLE, string("VDR Live-TV"))); metadata.SetProperty(cMetadata::Property(property::object::KEY_DESCRIPTION, string("Watch Live-TV"))); } else if((index = GetGroupByName(GetContainerName(uri))) != -1 && (channel = Channels.Get(index)) != NULL){ - metadata.SetProperty(cMetadata::Property(property::object::KEY_TITLE, string(channel->Name()))); - metadata.SetProperty(cMetadata::Property(property::object::KEY_DESCRIPTION, string(channel->Name()))); + TO_UTF8(channel->Name(), chanName, 1024); + metadata.SetProperty(cMetadata::Property(property::object::KEY_TITLE, string(chanName))); + metadata.SetProperty(cMetadata::Property(property::object::KEY_DESCRIPTION, string(chanName))); } else { return false; } |