diff options
author | Kacper Michajłow <kasper93@gmail.com> | 2017-03-06 10:50:50 +0300 |
---|---|---|
committer | Kacper Michajłow <kasper93@gmail.com> | 2017-03-06 10:50:50 +0300 |
commit | b989276ec26ede85b20ab469460882c850edcbcd (patch) | |
tree | 34ea494e14c919f8bca51b55c95c92303a147c89 /src/mpc-hc/DVBChannel.cpp | |
parent | d911f14d5619d800819d6f4658e72236720b79af (diff) | |
parent | ba2ea5d9e0cf5451398dfd438a0a962a0fe6fd74 (diff) |
Merge branch 'release-1.7.11'1.7.11
Diffstat (limited to 'src/mpc-hc/DVBChannel.cpp')
-rw-r--r-- | src/mpc-hc/DVBChannel.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/mpc-hc/DVBChannel.cpp b/src/mpc-hc/DVBChannel.cpp index e4a0b7e41..393d35c77 100644 --- a/src/mpc-hc/DVBChannel.cpp +++ b/src/mpc-hc/DVBChannel.cpp @@ -1,5 +1,5 @@ /*
- * (C) 2009-2015 see Authors.txt
+ * (C) 2009-2016 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -21,8 +21,15 @@ #include "stdafx.h"
#include "DVBChannel.h"
+#include "ISOLang.h"
+#include "mplayerc.h"
+LCID DVBStreamInfo::GetLCID() const
+{
+ return ISOLang::ISO6392ToLcid(CStringA(sLanguage));
+};
+
CDVBChannel::CDVBChannel(CString strChannel)
{
FromString(strChannel);
@@ -40,6 +47,8 @@ void CDVBChannel::FromString(CString strValue) m_strName = strValue.Tokenize(_T("|"), i);
m_ulFrequency = _tstol(strValue.Tokenize(_T("|"), i));
+ m_ulBandwidth = (nVersion > FORMAT_VERSION_4) ? _tstol(strValue.Tokenize(_T("|"), i))
+ : AfxGetAppSettings().iBDABandwidth * 1000;
m_nPrefNumber = _tstol(strValue.Tokenize(_T("|"), i));
m_nOriginNumber = _tstol(strValue.Tokenize(_T("|"), i));
if (nVersion > FORMAT_VERSION_0) {
@@ -98,10 +107,11 @@ CString CDVBChannel::ToString() const };
CString strValue;
- strValue.AppendFormat(_T("%d|%s|%lu|%d|%d|%d|%d|%lu|%lu|%lu|%lu|%lu|%lu|%d|%d|%d|%d|%d"),
+ strValue.AppendFormat(_T("%d|%s|%lu|%lu|%d|%d|%d|%d|%lu|%lu|%lu|%lu|%lu|%lu|%d|%d|%d|%d|%d"),
FORMAT_VERSION_CURRENT,
- m_strName,
+ m_strName.GetString(),
m_ulFrequency,
+ m_ulBandwidth,
m_nPrefNumber,
m_nOriginNumber,
m_bEncrypted,
|