mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

*neutrino record: reworked some code parts from last multirec commits

Browse Source 
- avoids using of boolean structures for record modes calls, handling of
  enum calls from record manager class should be easier
- remove boolean structure from infoviewer
- use commonly member name for count of recordings,
  GetRecordCount should be more plausible than GetRecmapSize

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1693 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-09-17 19:32:34 +00:00
parent ef8500638a
commit f63e3a532f
5 changed files with 84 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/driver/record.cpp
View File

@@ -73,6 +73,7 @@ bool sectionsd_getComponentTagsUniqueKey(const event_id_t uniqueKey, CSectionsdC
extern "C" {
#include <driver/genpsi.h>
#include "record.h"
}
//-------------------------------------------------------------------------
@@ -682,6 +683,24 @@ const std::string CRecordManager::GetFileName(t_channel_id channel_id)
return filename;
}
int CRecordManager::GetRecordMode()
{
if (RecordingStatus() || IsTimeshift())
{
int records = GetRecmapSize();
if (RecordingStatus() && !IsTimeshift())
return RECMODE_REC;
else if (IsTimeshift() && (records == 1))
return RECMODE_TSHIFT;
else if (IsTimeshift() && (records > 1))
return RECMODE_REC_TSHIFT;
else
return RECMODE_OFF;
}
else
return RECMODE_OFF;
}
bool CRecordManager::Record(const t_channel_id channel_id, const char * dir, bool timeshift)
{
CTimerd::RecordingInfo eventinfo;
@@ -708,7 +727,7 @@ bool CRecordManager::Record(const t_channel_id channel_id, const char * dir, boo
bool CRecordManager::Record(const CTimerd::RecordingInfo * const eventinfo, const char * dir, bool timeshift)
{
CRecordInstance * inst;
CRecordInstance * inst = NULL;
record_error_msg_t error_msg = RECORD_OK;
/* for now, empty eventinfo.recordingDir means this is direct record, FIXME better way ?
* neutrino check if this channel_id already recording, may be not needed */
@@ -751,7 +770,9 @@ bool CRecordManager::Record(const CTimerd::RecordingInfo * const eventinfo, cons
else
newdir = Directory;
inst = new CRecordInstance(eventinfo, newdir, timeshift, StreamVTxtPid, StreamPmtPid);
if (inst == NULL)
inst = new CRecordInstance(eventinfo, newdir, timeshift, StreamVTxtPid, StreamPmtPid);
error_msg = inst->Record();
if(error_msg == RECORD_OK) {
recmap.insert(std::pair<t_channel_id, CRecordInstance*>(eventinfo->channel_id, inst));
@@ -782,7 +803,7 @@ bool CRecordManager::Record(const CTimerd::RecordingInfo * const eventinfo, cons
RunStopScript();
RestoreNeutrino();
printf("%s: error code: %d\n", __FUNCTION__, error_msg);
printf("[recordmanager] %s: error code: %d\n", __FUNCTION__, error_msg);
//FIXME: Use better error message
DisplayErrorMessage(g_Locale->getText(
error_msg == RECORD_BUSY ? LOCALE_STREAMING_BUSY :
@@ -1099,7 +1120,7 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey )
char rec_msg[256];
char rec_msg1[256];
int records = recmap.size();
int i = 0;
snprintf(rec_msg1, sizeof(rec_msg1)-1, "%s", g_Locale->getText(LOCALE_RECORDINGMENU_MULTIMENU_ASK_STOP_ALL));
snprintf(rec_msg, sizeof(rec_msg)-1, rec_msg1, records);
if(ShowMsgUTF(LOCALE_SHUTDOWN_RECODING_QUERY, rec_msg,
@@ -1109,6 +1130,7 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey )
snprintf(rec_msg, sizeof(rec_msg)-1, rec_msg1, records);
CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, rec_msg);
hintBox->paint();
int i = 0;
int recording_ids[RECORD_MAX_COUNT];
t_channel_id channel_ids[RECORD_MAX_COUNT];
t_channel_id channel_id;
@@ -1167,7 +1189,7 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey )
bool CRecordManager::ShowMenu(void)
{
int select = -1, i = 0, shortcut = 1, recmap_size = recmap.size();
int select = -1, recmap_size = recmap.size();
char cnt[5];
CMenuForwarderNonLocalized * item;
CMenuForwarder * iteml;
@@ -1189,11 +1211,13 @@ bool CRecordManager::ShowMenu(void)
iteml = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT, !status_ts, NULL,
this, "Timeshift", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
menu.addItem(iteml, false);
if(recmap_size > 0)
{
menu.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MAINMENU_RECORDING_STOP));
mutex.lock();
int i = 0 , shortcut = 1;
for(recmap_iterator_t it = recmap.begin(); it != recmap.end(); it++) {
t_channel_id channel_id = it->first;
CRecordInstance * inst = it->second;

13
src/driver/record.h
View File

@@ -104,7 +104,7 @@ class CRecordInstance
record_error_msg_t MakeFileName(CZapitChannel * channel);
bool SaveXml();
record_error_msg_t Start(CZapitChannel * channel /*, APIDList &apid_list*/);
public:
public:
CRecordInstance(const CTimerd::RecordingInfo * const eventinfo, std::string &dir, bool timeshift = false, bool stream_vtxt_pid = false, bool stream_pmt_pid = false);
~CRecordInstance();
@@ -156,6 +156,14 @@ class CRecordManager : public CMenuTarget, public CChangeObserver
void SetTimeshiftMode(CRecordInstance * inst=NULL, int mode=TSHIFT_MODE_OFF);
public:
enum record_modes_t
{
RECMODE_OFF = 0,
RECMODE_REC = 1,
RECMODE_TSHIFT = 2,
RECMODE_REC_TSHIFT = 3,
};
CRecordManager();
~CRecordManager();
@@ -198,8 +206,9 @@ class CRecordManager : public CMenuTarget, public CChangeObserver
int recordingstatus;
bool doGuiRecord();
bool changeNotify(const neutrino_locale_t OptionName, void * /*data*/);
int GetRecmapSize() { return recmap.size(); };
int GetRecordCount() { return recmap.size(); };
bool IsTimeshift(t_channel_id channel_id=0);
void StartTimeshift();
int GetRecordMode();
};
#endif