mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +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

17
src/gui/epgview.cpp
View File

@@ -779,19 +779,18 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
case CRCInput::RC_red:
if (!g_settings.minimode && (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF))
{
char recDir[255];
std::string recDir;
//CTimerdClient timerdclient;
if (g_Timerd->isTimerdAvailable())
{
bool doRecord = true;
//char *recDir = g_settings.network_nfs_recordingdir;
strcpy(recDir, g_settings.network_nfs_recordingdir);
recDir = g_settings.network_nfs_recordingdir;
if (g_settings.recording_choose_direct_rec_dir == 2) {
CFileBrowser b;
b.Dir_Mode=true;
hide();
if (b.exec(g_settings.network_nfs_recordingdir)) {
strcpy(recDir, b.getSelectedFile()->Name.c_str());
if (b.exec(g_settings.network_nfs_recordingdir.c_str())) {
recDir = b.getSelectedFile()->Name;
} else
doRecord = false;
if (!bigFonts && g_settings.bigFonts) {
@@ -805,7 +804,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
else if (g_settings.recording_choose_direct_rec_dir == 1)
{
int lid = -1;
CMountChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR,NEUTRINO_ICON_SETTINGS,&lid,NULL,g_settings.network_nfs_recordingdir);
CMountChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR,NEUTRINO_ICON_SETTINGS,&lid,NULL,g_settings.network_nfs_recordingdir.c_str());
if (recDirs.hasItem())
{
hide();
@@ -823,12 +822,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
printf("no network devices available\n");
}
if (lid != -1)
strcpy(recDir, g_settings.network_nfs_local_dir[lid]);
//recDir = g_settings.network_nfs_local_dir[id];
//else
//recDir = NULL;
recDir = g_settings.network_nfs[lid].local_dir;
}
//if (recDir != NULL)
if (doRecord)
{
if (g_Timerd->addRecordTimerEvent(channel_id,