mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 00:13:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/next-cc'

Browse Source 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-07-06 19:01:15 +02:00
parent 430444ff21 6fda429273
commit 7e692549d3
91 changed files with 5546 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/driver/record.h
View File

@@ -123,7 +123,7 @@ class CRecordInstance
t_channel_id GetChannelId(void) { return channel_id; };
std::string GetEpgTitle(void) { return epgTitle; };
MI_MOVIE_INFO * GetMovieInfo(void) { return recMovieInfo; };
void GetRecordString(std::string& str);
void GetRecordString(std::string& str, std::string &dur);
const char * GetFileName() { return filename; };
bool Timeshift() { return autoshift; };
int tshift_mode;
@@ -149,6 +149,7 @@ class CRecordManager : public CMenuTarget /*, public CChangeObserver*/
nextmap_t nextmap;
std::string Directory;
std::string TimeshiftDirectory;
std::vector<std::string> durations;
bool StreamVTxtPid;
bool StreamSubtitlePids;
bool StreamPmtPid;