Permalink
Browse files

Fix hiding of SetStreamData(void)

This is a helper function called by SetStreamData(MPEGStreamData*), renamed to InitStreamData().
  • Loading branch information...
daniel-kristjansson committed Jun 28, 2012
1 parent 695c2be commit 0b6b25325df806ab0b49babe360f4773340f5021
@@ -243,10 +243,10 @@ void DTVRecorder::SetStreamData(MPEGStreamData *data)
delete old_data;
if (_stream_data)
SetStreamData();
InitStreamData();
}
void DTVRecorder::SetStreamData(void)
void DTVRecorder::InitStreamData(void)
{
_stream_data->AddMPEGSPListener(this);
_stream_data->AddMPEGListener(this);
@@ -51,7 +51,6 @@ class DTVRecorder :
int GetVideoFd(void) { return _stream_fd; }
virtual void SetNextRecording(const ProgramInfo*, RingBuffer*);
virtual void SetStreamData(void);
virtual void SetStreamData(MPEGStreamData* sd);
MPEGStreamData *GetStreamData(void) const { return _stream_data; }
@@ -90,6 +89,8 @@ class DTVRecorder :
bool ProcessAVTSPacket(const TSPacket &tspacket);
protected:
virtual void InitStreamData(void);
void FinishRecording(void);
void ResetForNewFile(void);
@@ -217,7 +217,7 @@ bool FirewireRecorder::PauseAndWait(int timeout)
return IsPaused(true);
}
void FirewireRecorder::SetStreamData(void)
void FirewireRecorder::InitStreamData(void)
{
_stream_data->AddMPEGSPListener(this);
@@ -52,9 +52,9 @@ class FirewireRecorder :
const QString &videodev,
const QString &audiodev,
const QString &vbidev);
void SetStreamData(void);
protected:
virtual void InitStreamData(void);
FirewireRecorder(TVRec *rec);
private:
@@ -36,7 +36,7 @@ class ImportRecorder : public DTVRecorder
bool Open(void);
void Close(void);
void SetStreamData(void) {}
void InitStreamData(void) {}
private:
int _import_fd;
@@ -923,7 +923,7 @@ void MpegRecorder::run(void)
int progNum = 1;
MPEGStreamData *sd = new MPEGStreamData(progNum, true);
sd->SetRecordingType(_recording_type);
DTVRecorder::SetStreamData(sd);
SetStreamData(sd);
_stream_data->AddAVListener(this);
_stream_data->AddWritingListener(this);
@@ -1135,7 +1135,7 @@ void MpegRecorder::run(void)
{
_stream_data->RemoveWritingListener(this);
_stream_data->RemoveAVListener(this);
DTVRecorder::SetStreamData(NULL);
SetStreamData(NULL);
}
QMutexLocker locker(&pauseLock);
@@ -1370,7 +1370,7 @@ void MpegRecorder::StopEncoding(void)
readfd = -1;
}
void MpegRecorder::SetStreamData(void)
void MpegRecorder::InitStreamData(void)
{
_stream_data->AddMPEGSPListener(this);
_stream_data->SetDesiredProgram(1);
@@ -41,9 +41,6 @@ class MpegRecorder : public V4LRecorder,
bool Open(void);
int GetVideoFd(void) { return chanfd; }
// TS
virtual void SetStreamData(void);
// TSPacketListener
bool ProcessTSPacket(const TSPacket &tspacket);
@@ -52,6 +49,7 @@ class MpegRecorder : public V4LRecorder,
virtual void PriorityEvent(int fd) { }
private:
virtual void InitStreamData(void);
void SetIntOption(RecordingProfile *profile, const QString &name);
void SetStrOption(RecordingProfile *profile, const QString &name);

0 comments on commit 0b6b253

Please sign in to comment.