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

convert most char[...] configuration values to std::string

Browse Source 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-06-11 13:32:19 +02:00
committed by Jacek Jendrzej
parent e0df013c9c
commit 7ebfe9959d
40 changed files with 483 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/neutrinofonts.cpp
View File

@@ -134,11 +134,11 @@ void CNeutrinoFonts::SetupNeutrinoFonts(bool initRenderClass/*=true*/)
old_fontDescr.size_offset = fontDescr.size_offset;
old_fontDescr.filename = fontDescr.filename;
fontDescr.filename = "";
printf("[neutrino] settings font file %s\n", g_settings.font_file);
if (access(g_settings.font_file, F_OK)) {
printf("[neutrino] settings font file %s\n", g_settings.font_file.c_str());
if (access(g_settings.font_file.c_str(), F_OK)) {
if (!access(FONTDIR"/neutrino.ttf", F_OK)) {
fontDescr.filename = FONTDIR"/neutrino.ttf";
strcpy(g_settings.font_file, fontDescr.filename.c_str());
g_settings.font_file = fontDescr.filename;
}
else {
fprintf( stderr,"[neutrino] font file [%s] not found\n neutrino exit\n",FONTDIR"/neutrino.ttf");

6
src/driver/record.cpp
View File

@@ -614,12 +614,12 @@ record_error_msg_t CRecordInstance::MakeFileName(CZapitChannel * channel)
if(check_dir(Directory.c_str())) {
/* check if Directory and network_nfs_recordingdir the same */
if(strcmp(g_settings.network_nfs_recordingdir, Directory.c_str())) {
if(g_settings.network_nfs_recordingdir != Directory) {
/* not the same, check network_nfs_recordingdir and return error if not ok */
if(check_dir(g_settings.network_nfs_recordingdir))
if(check_dir(g_settings.network_nfs_recordingdir.c_str()))
return RECORD_INVALID_DIRECTORY;
/* fallback to g_settings.network_nfs_recordingdir */
Directory = std::string(g_settings.network_nfs_recordingdir);
Directory = g_settings.network_nfs_recordingdir;
}else{
return RECORD_INVALID_DIRECTORY;
}

4
src/driver/record.h
View File

@@ -211,8 +211,8 @@ class CRecordManager : public CMenuTarget /*, public CChangeObserver*/
StreamSubtitlePids = stream_subtitle_pids;
StreamPmtPid = stream_pmt_pid;
};
void SetDirectory(const char * const directory) { Directory = directory; };
void SetTimeshiftDirectory(const char * const directory) { TimeshiftDirectory = directory; };
void SetDirectory(std::string directory) { Directory = directory; };
void SetTimeshiftDirectory(std::string directory) { TimeshiftDirectory = directory; };
bool RecordingStatus(const t_channel_id channel_id = 0);
bool TimeshiftOnly();
bool Timeshift() { return (autoshift || shift_timer); };