mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +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>
This commit is contained in:
martii
2013-06-11 13:32:19 +02:00
committed by Jacek Jendrzej
parent fce161b70b
commit cbc9299df8
40 changed files with 483 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/gui/moviebrowser.cpp
View File

@@ -1002,8 +1002,8 @@ int CMovieBrowser::exec(const char* path)
//umount automount dirs
for(int i = 0; i < NETWORK_NFS_NR_OF_ENTRIES; i++)
{
if(g_settings.network_nfs_automount[i])
umount2(g_settings.network_nfs_local_dir[i],MNT_FORCE);
if(g_settings.network_nfs[i].automount)
umount2(g_settings.network_nfs[i].local_dir.c_str(), MNT_FORCE);
}
CFSMounter::automount();
}
@@ -2509,10 +2509,9 @@ void CMovieBrowser::updateDir(void)
}
#endif
// check if there is a record dir and if we should use it
if(g_settings.network_nfs_recordingdir[0] != 0 )
if(!g_settings.network_nfs_recordingdir.empty())
{
std::string name = g_settings.network_nfs_recordingdir;
addDir(name,&m_settings.storageDirRecUsed);
addDir(g_settings.network_nfs_recordingdir, &m_settings.storageDirRecUsed);
}
for(int i = 0; i < MB_MAX_DIRS; i++)
@@ -3990,11 +3989,10 @@ CDirMenu::CDirMenu(std::vector<MB_DIR>* dir_list)
{
for(int nfs = 0; nfs < NETWORK_NFS_NR_OF_ENTRIES; nfs++)
{
std::string tmp = g_settings.network_nfs_local_dir[nfs];
int result = -1;
if(!tmp.empty())
result = (*dirList)[i].name.compare( 0,tmp.size(),tmp) ;
printf("[CDirMenu] (nfs%d) %s == (mb%d) %s (%d)\n",nfs,g_settings.network_nfs_local_dir[nfs],i,(*dirList)[i].name.c_str(),result);
if(!g_settings.network_nfs[nfs].local_dir.empty())
result = (*dirList)[i].name.compare( 0,g_settings.network_nfs[nfs].local_dir.size(),g_settings.network_nfs[nfs].local_dir) ;
printf("[CDirMenu] (nfs%d) %s == (mb%d) %s (%d)\n",nfs,g_settings.network_nfs[nfs].local_dir.c_str(),i,(*dirList)[i].name.c_str(),result);
if(result == 0)
{
@@ -4025,8 +4023,8 @@ int CDirMenu::exec(CMenuTarget* parent, const std::string & actionKey)
{
if(dirState[number] == DIR_STATE_SERVER_DOWN)
{
printf("try to start server: %s %s\n","ether-wake", g_settings.network_nfs_mac[dirNfsMountNr[number]]);
if (my_system(2, "ether-wake", g_settings.network_nfs_mac[dirNfsMountNr[number]]) != 0)
printf("try to start server: %s %s\n","ether-wake", g_settings.network_nfs[dirNfsMountNr[number]].mac.c_str());
if (my_system(2, "ether-wake", g_settings.network_nfs[dirNfsMountNr[number]].mac.c_str()) != 0)
perror("ether-wake failed");
dirOptionText[number]="STARTE SERVER";
@@ -4035,14 +4033,14 @@ int CDirMenu::exec(CMenuTarget* parent, const std::string & actionKey)
{
printf("[CDirMenu] try to mount %d,%d\n",number,dirNfsMountNr[number]);
CFSMounter::MountRes res;
res = CFSMounter::mount( g_settings.network_nfs_ip[dirNfsMountNr[number]].c_str(),
g_settings.network_nfs_dir[dirNfsMountNr[number]] ,
g_settings.network_nfs_local_dir[dirNfsMountNr[number]] ,
(CFSMounter::FSType)g_settings.network_nfs_type[dirNfsMountNr[number]] ,
g_settings.network_nfs_username[dirNfsMountNr[number]] ,
g_settings.network_nfs_password[dirNfsMountNr[number]] ,
g_settings.network_nfs_mount_options1[dirNfsMountNr[number]] ,
g_settings.network_nfs_mount_options2[dirNfsMountNr[number]] );
res = CFSMounter::mount( g_settings.network_nfs[dirNfsMountNr[number]].ip,
g_settings.network_nfs[dirNfsMountNr[number]].dir,
g_settings.network_nfs[dirNfsMountNr[number]].local_dir,
(CFSMounter::FSType)g_settings.network_nfs[dirNfsMountNr[number]].type ,
g_settings.network_nfs[dirNfsMountNr[number]].username,
g_settings.network_nfs[dirNfsMountNr[number]].password,
g_settings.network_nfs[dirNfsMountNr[number]].mount_options1,
g_settings.network_nfs[dirNfsMountNr[number]].mount_options2);
if(res == CFSMounter::MRES_OK) // if mount is successful we set the state to active in any case
{
*(*dirList)[number].used = true;
@@ -4083,7 +4081,7 @@ void CDirMenu::updateDirState(void)
printf("updateDirState: %d: state %d nfs %d\n", i, dirState[i], dirNfsMountNr[i]);
if(dirNfsMountNr[i] != -1)
{
int retvalue = pinghost(g_settings.network_nfs_ip[dirNfsMountNr[i]].c_str());
int retvalue = pinghost(g_settings.network_nfs[dirNfsMountNr[i]].ip.c_str());
if (retvalue == 0)//LOCALE_PING_UNREACHABLE
{
dirOptionText[i]="Server, offline";
@@ -4091,7 +4089,7 @@ printf("updateDirState: %d: state %d nfs %d\n", i, dirState[i], dirNfsMountNr[i]
}
else if (retvalue == 1)//LOCALE_PING_OK
{
if(CFSMounter::isMounted (g_settings.network_nfs_local_dir[dirNfsMountNr[i]]) == 0)
if(!CFSMounter::isMounted (g_settings.network_nfs[dirNfsMountNr[i]].local_dir))
{
dirOptionText[i]="Not mounted";
dirState[i]=DIR_STATE_NOT_MOUNTED;