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

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

View File

@@ -178,8 +178,8 @@ void CAudioPlayerGui::Init(void)
m_select_title_by_name = g_settings.audioplayer_select_title_by_name==1;
if (strlen(g_settings.network_nfs_audioplayerdir)!=0)
m_Path = g_settings.network_nfs_audioplayerdir;
if (!g_settings.network_nfs_audioplayerdir.empty())
m_Path = g_settings.network_nfs_audioplayerdir.c_str();
else
m_Path = "/";
@@ -1218,7 +1218,7 @@ bool CAudioPlayerGui::openFilebrowser(void)
{
bool result = false;
CFileBrowser filebrowser((g_settings.filebrowser_denydirectoryleave)
? g_settings.network_nfs_audioplayerdir : "");
? g_settings.network_nfs_audioplayerdir.c_str() : "");
filebrowser.Multi_Select = true;
filebrowser.Dirs_Selectable = true;
@@ -1389,8 +1389,8 @@ bool CAudioPlayerGui::openFilebrowser(void)
printTimevalDiff(start,end);
#endif
//store last dir
if( (sizeof(g_settings.network_nfs_audioplayerdir)) > m_Path.size() && (strcmp(g_settings.network_nfs_audioplayerdir,m_Path.c_str()) != 0))
strcpy(g_settings.network_nfs_audioplayerdir,m_Path.c_str());
if( (g_settings.network_nfs_audioplayerdir.size()) > m_Path.size() && g_settings.network_nfs_audioplayerdir != m_Path.c_str() )
g_settings.network_nfs_audioplayerdir = m_Path;
result = true;
}
@@ -2584,8 +2584,8 @@ void CAudioPlayerGui::savePlaylist()
dirFilter.addFilter("m3u");
browser.Filter = &dirFilter;
// select preferred directory if exists
if (strlen(g_settings.network_nfs_audioplayerdir) != 0)
path = g_settings.network_nfs_audioplayerdir;
if (!g_settings.network_nfs_audioplayerdir.empty())
path = g_settings.network_nfs_audioplayerdir.c_str();
else
path = "/";