diff --git a/mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp b/mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp
index 194c85f..8680744 100644
a
|
b
|
int HLSReader::DownloadSegmentData(MythSingleDownload& downloader, |
1294 | 1294 | |
1295 | 1295 | #ifdef USING_LIBCRYPTO |
1296 | 1296 | /* If the segment is encrypted, decode it */ |
1297 | | if (segment.HasKeyPath()) |
| 1297 | if (hls->HasKeyPath()) |
1298 | 1298 | { |
1299 | 1299 | if (!hls->DecodeData(downloader, hls->IVLoaded() ? hls->AESIV() : NULL, |
1300 | | segment.KeyPath(), |
1301 | | buffer, segment.Sequence())); |
1302 | | return 0; |
| 1300 | hls->KeyPath(), |
| 1301 | buffer, segment.Sequence())) |
| 1302 | { |
| 1303 | return 0; |
| 1304 | } |
1303 | 1305 | } |
1304 | 1306 | #endif |
1305 | 1307 | |
diff --git a/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h b/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h
index e38b08e..df065ec 100644
a
|
b
|
class HLSRecSegment |
32 | 32 | #ifdef USING_LIBCRYPTO |
33 | 33 | bool DownloadKey(void); |
34 | 34 | bool DecodeData(const uint8_t *IV, QByteArray& data); |
35 | | bool HasKeyPath(void) const { return !m_psz_key_path.isEmpty(); } |
36 | | QString KeyPath(void) const { return m_psz_key_path; } |
37 | | void SetKeyPath(const QString path) { m_psz_key_path = path; } |
| 35 | //bool HasKeyPath(void) const { return !m_psz_key_path.isEmpty(); } |
| 36 | //QString KeyPath(void) const { return m_psz_key_path; } |
| 37 | //void SetKeyPath(const QString path) { m_psz_key_path = path; } |
38 | 38 | #endif |
39 | 39 | |
40 | 40 | protected: |
diff --git a/mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp
index b2d64c2..7eb4471 100644
a
|
b
|
bool HLSRecStream::DecodeData(MythSingleDownload& downloader, |
80 | 80 | { |
81 | 81 | AESKeyMap::iterator Ikey; |
82 | 82 | |
83 | | if ((Ikey = m_aeskeys.find(keypath)) == m_aeskeys.end()) |
| 83 | if (!m_aeskeys.contains(keypath)) |
84 | 84 | { |
85 | 85 | AES_KEY* key = new AES_KEY; |
86 | 86 | DownloadKey(downloader, keypath, key); |
diff --git a/mythtv/libs/libmythtv/recorders/HLS/HLSStream.h b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.h
index 8e81040..193c605 100644
a
|
b
|
class HLSRecStream |
69 | 69 | |
70 | 70 | uint8_t *AESIV(void) { return m_AESIV; } |
71 | 71 | void SetKeyPath(const QString x) { m_keypath = x; } |
| 72 | bool HasKeyPath(void) const { return !m_keypath.isEmpty(); } |
| 73 | QString KeyPath(void) const { return m_keypath; } |
| 74 | |
72 | 75 | #endif // USING_LIBCRYPTO |
73 | 76 | |
74 | 77 | protected: |