Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PVR Add-on API v9.2.0 #195

Merged
merged 2 commits into from
Oct 24, 2024
Merged

PVR Add-on API v9.2.0 #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a97f2d
PVR Add-on API v9.2.0
ksooo Oct 22, 2024
0ac2a5c
Merge branch 'Piers' into addon-api-9-2-0
ksooo Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pvr.dvbviewer/addon.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.dvbviewer"
version="22.1.0"
version="22.2.0"
name="DVBViewer Client"
provider-name="Manuel Mausz">
<requires>@ADDON_DEPENDS@</requires>
Expand Down
3 changes: 3 additions & 0 deletions pvr.dvbviewer/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v22.2.0
- PVR Add-on API v9.2.0

v22.1.0
- PVR Add-on API v9.0.0

Expand Down
10 changes: 5 additions & 5 deletions src/DvbData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ PVR_ERROR Dvb::GetRecordingsAmount(bool deleted, int& amount)
return PVR_ERROR_NO_ERROR;
}

bool Dvb::OpenRecordedStream(const kodi::addon::PVRRecording& recinfo)
bool Dvb::OpenRecordedStream(const kodi::addon::PVRRecording& recinfo, int64_t& streamId)
{
std::lock_guard<std::mutex> lock(m_mutex);

Expand Down Expand Up @@ -835,29 +835,29 @@ bool Dvb::OpenRecordedStream(const kodi::addon::PVRRecording& recinfo)
return m_recReader->Start();
}

void Dvb::CloseRecordedStream()
void Dvb::CloseRecordedStream(int64_t streamId)
{
if (m_recReader)
SafeDelete(m_recReader);
}

int Dvb::ReadRecordedStream(unsigned char* buffer, unsigned int size)
int Dvb::ReadRecordedStream(int64_t streamId, unsigned char* buffer, unsigned int size)
{
if (!m_recReader)
return 0;

return static_cast<int>(m_recReader->ReadData(buffer, size));
}

int64_t Dvb::SeekRecordedStream(int64_t position, int whence)
int64_t Dvb::SeekRecordedStream(int64_t streamId, int64_t position, int whence)
{
if (!m_recReader)
return 0;

return m_recReader->Seek(position, whence);
}

int64_t Dvb::LengthRecordedStream()
int64_t Dvb::LengthRecordedStream(int64_t streamId)
{
if (!m_recReader)
return -1;
Expand Down
10 changes: 5 additions & 5 deletions src/DvbData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@ class Dvb
PVR_ERROR DeleteRecording(
const kodi::addon::PVRRecording& recording) override;
PVR_ERROR GetRecordingsAmount(bool deleted, int& amount) override;
bool OpenRecordedStream(const kodi::addon::PVRRecording& recinfo) override;
void CloseRecordedStream() override;
int ReadRecordedStream(unsigned char* buffer, unsigned int size) override;
int64_t SeekRecordedStream(int64_t position, int whence) override;
int64_t LengthRecordedStream() override;
bool OpenRecordedStream(const kodi::addon::PVRRecording& recinfo, int64_t& streamId) override;
void CloseRecordedStream(int64_t streamId) override;
int ReadRecordedStream(int64_t streamId, unsigned char* buffer, unsigned int size) override;
int64_t SeekRecordedStream(int64_t streamId, int64_t position, int whence) override;
int64_t LengthRecordedStream(int64_t streamId) override;
PVR_ERROR GetRecordingEdl(const kodi::addon::PVRRecording& recinfo,
std::vector<kodi::addon::PVREDLEntry>& edl) override;
PVR_ERROR SetRecordingPlayCount(const kodi::addon::PVRRecording& recinfo,
Expand Down