From eaedec2d0a1fed212a01a44edb66d4313632ab8c Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 12 Oct 2012 06:24:16 +0200 Subject: [PATCH 1/2] adapt cRecord API to coolstream changes Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/c4422bcfbb658867327d6dfa45875d205675b57b Author: Stefan Seyfried Date: 2012-10-12 (Fri, 12 Oct 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libspark/record.cpp | 12 +++++++++++- libspark/record_lib.h | 9 ++++++++- libtriple/record_td.cpp | 12 +++++++++++- libtriple/record_td.h | 9 ++++++++- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/libspark/record.cpp b/libspark/record.cpp index 79d1f5f..521b161 100644 --- a/libspark/record.cpp +++ b/libspark/record.cpp @@ -54,7 +54,7 @@ void cRecord::Close(void) } #endif -bool cRecord::Start(int fd, unsigned short vpid, unsigned short * apids, int numpids) +bool cRecord::Start(int fd, unsigned short vpid, unsigned short *apids, int numpids, uint64_t) { lt_info("%s: fd %d, vpid 0x%03x\n", __func__, fd, vpid); int i; @@ -306,3 +306,13 @@ void cRecord::RecordThread() pthread_exit(NULL); } +int GetStatus() +{ + /* dummy for now */ + return REC_STATUS_OK; +} + +void ResetStatus() +{ + return; +} diff --git a/libspark/record_lib.h b/libspark/record_lib.h index e918e64..9d3d6b6 100644 --- a/libspark/record_lib.h +++ b/libspark/record_lib.h @@ -4,6 +4,10 @@ #include #include "dmx_lib.h" +#define REC_STATUS_OK 0 +#define REC_STATUS_SLOW 1 +#define REC_STATUS_OVERFLOW 2 + typedef enum { RECORD_RUNNING, RECORD_STOPPED, @@ -22,14 +26,17 @@ class cRecord pthread_t record_thread; bool record_thread_running; record_state_t exit_flag; + int state; public: cRecord(int num = 0); ~cRecord(); bool Open(); - bool Start(int fd, unsigned short vpid, unsigned short *apids, int numapids); + bool Start(int fd, unsigned short vpid, unsigned short *apids, int numapids, uint64_t ch = 0); bool Stop(void); bool AddPid(unsigned short pid); + int GetStatus(); + void ResetStatus(); bool ChangePids(unsigned short vpid, unsigned short *apids, int numapids); void RecordThread(); diff --git a/libtriple/record_td.cpp b/libtriple/record_td.cpp index 32c1a01..0289a3a 100644 --- a/libtriple/record_td.cpp +++ b/libtriple/record_td.cpp @@ -50,7 +50,7 @@ void cRecord::Close(void) } #endif -bool cRecord::Start(int fd, unsigned short vpid, unsigned short * apids, int numpids) +bool cRecord::Start(int fd, unsigned short vpid, unsigned short *apids, int numpids, uint64_t) { lt_info("%s: fd %d, vpid 0x%03x\n", __func__, fd, vpid); int i; @@ -259,3 +259,13 @@ void cRecord::RecordThread() pthread_exit(NULL); } +int GetStatus() +{ + /* dummy for now */ + return REC_STATUS_OK; +} + +void ResetStatus() +{ + return; +} diff --git a/libtriple/record_td.h b/libtriple/record_td.h index 75099f7..c2f60ea 100644 --- a/libtriple/record_td.h +++ b/libtriple/record_td.h @@ -4,6 +4,10 @@ #include #include "dmx_td.h" +#define REC_STATUS_OK 0 +#define REC_STATUS_SLOW 1 +#define REC_STATUS_OVERFLOW 2 + typedef enum { RECORD_RUNNING, RECORD_STOPPED, @@ -21,14 +25,17 @@ class cRecord pthread_t record_thread; bool record_thread_running; record_state_t exit_flag; + int state; public: cRecord(int num = 0); ~cRecord(); bool Open(); - bool Start(int fd, unsigned short vpid, unsigned short *apids, int numapids); + bool Start(int fd, unsigned short vpid, unsigned short *apids, int numapids, uint64_t ch = 0); bool Stop(void); bool AddPid(unsigned short pid); + int GetStatus(); + void ResetStatus(); bool ChangePids(unsigned short vpid, unsigned short *apids, int numapids); void RecordThread(); From 333463d7592da3a8f9ed9f1dacfccad9a54ba0ea Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 12 Oct 2012 06:35:29 +0200 Subject: [PATCH 2/2] cRecord: fix last commit Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/0e96784ad9c8c22533e1f5d6c458bb7f8374ba5d Author: Stefan Seyfried Date: 2012-10-12 (Fri, 12 Oct 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libspark/record.cpp | 4 ++-- libtriple/record_td.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libspark/record.cpp b/libspark/record.cpp index 521b161..79497a8 100644 --- a/libspark/record.cpp +++ b/libspark/record.cpp @@ -306,13 +306,13 @@ void cRecord::RecordThread() pthread_exit(NULL); } -int GetStatus() +int cRecord::GetStatus() { /* dummy for now */ return REC_STATUS_OK; } -void ResetStatus() +void cRecord::ResetStatus() { return; } diff --git a/libtriple/record_td.cpp b/libtriple/record_td.cpp index 0289a3a..584aba7 100644 --- a/libtriple/record_td.cpp +++ b/libtriple/record_td.cpp @@ -259,13 +259,13 @@ void cRecord::RecordThread() pthread_exit(NULL); } -int GetStatus() +int cRecord::GetStatus() { /* dummy for now */ return REC_STATUS_OK; } -void ResetStatus() +void cRecord::ResetStatus() { return; }