Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 269f491b571a837eb6efd6a2647a570878bc4ef3 (commit)
from 6ac4efb8c8b046ba88fca11c10ab4f9cc9ddca3e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 269f491b571a837eb6efd6a2647a570878bc4ef3
Author: GetAway <[email protected]>
Date: Fri May 22 12:12:47 2015 +0200
neutrino: introduce func to_string() and use it
code based on martii
Signed-off-by: GetAway <[email protected]>
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp
b/tuxbox/neutrino/src/gui/epgview.cpp
index b1424eb..21a114c 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -36,7 +36,6 @@
#endif
#include <algorithm>
-#include <sstream>
#include <gui/epgview.h>
@@ -47,8 +46,8 @@
#include <gui/widget/mountchooser.h>
#include <gui/widget/dirchooser.h>
#include <gui/widget/progressbar.h>
-
#include <gui/timerlist.h>
+#include <system/helper.h>
#include <global.h>
#include <neutrino.h>
@@ -1066,12 +1065,10 @@ void CEpgData::showTimerEventBar(bool _show, bool
webzap)
frameBuffer->paintBoxRel(sx, sy + oy, ox-60, buttonheight,
COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_LEFT);
std::string tmp_but_name;
- std::stringstream s;
- s << g_settings.wzap_time;
const char *but_name = NULL;
if (g_settings.wzap_time && webzap && !g_Timerd->adzap_eventID) {
tmp_but_name = g_Locale->getText(LOCALE_ADZAP);
- tmp_but_name += " "+ s.str() + " ";
+ tmp_but_name += " "+ to_string(g_settings.wzap_time) + " ";
tmp_but_name += g_Locale->getText(LOCALE_WORD_MINUTES_SHORT);
but_name = tmp_but_name.c_str();
}
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index b531f55..852fb75 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -447,29 +447,19 @@ int CNeutrinoApp::loadSetup()
#endif
//network
- char cfg_key[81];
for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++)
{
- sprintf(cfg_key, "network_nfs_ip_%d", i);
- g_settings.network_nfs_ip[i] = configfile.getString(cfg_key,
"");
- sprintf(cfg_key, "network_nfs_dir_%d", i);
- strcpy( g_settings.network_nfs_dir[i], configfile.getString(
cfg_key, "" ).c_str() );
- sprintf(cfg_key, "network_nfs_local_dir_%d", i);
- strcpy( g_settings.network_nfs_local_dir[i],
configfile.getString( cfg_key, "" ).c_str() );
- sprintf(cfg_key, "network_nfs_automount_%d", i);
- g_settings.network_nfs_automount[i] = configfile.getInt32(
cfg_key, 0);
- sprintf(cfg_key, "network_nfs_type_%d", i);
- g_settings.network_nfs_type[i] = configfile.getInt32( cfg_key,
0);
- sprintf(cfg_key, "network_nfs_username_%d", i);
- strcpy( g_settings.network_nfs_username[i],
configfile.getString( cfg_key, "" ).c_str() );
- sprintf(cfg_key, "network_nfs_password_%d", i);
- strcpy( g_settings.network_nfs_password[i],
configfile.getString( cfg_key, "" ).c_str() );
- sprintf(cfg_key, "network_nfs_mount_options1_%d", i);
- strcpy( g_settings.network_nfs_mount_options1[i],
configfile.getString( cfg_key, "ro,soft,udp" ).c_str() );
- sprintf(cfg_key, "network_nfs_mount_options2_%d", i);
- strcpy( g_settings.network_nfs_mount_options2[i],
configfile.getString( cfg_key, "nolock,rsize=8192,wsize=8192" ).c_str() );
- sprintf(cfg_key, "network_nfs_mac_%d", i);
- strcpy( g_settings.network_nfs_mac[i], configfile.getString(
cfg_key, "11:22:33:44:55:66").c_str() );
+ std::string i_str(to_string(i));
+ g_settings.network_nfs_ip[i] =
configfile.getString("network_nfs_ip_" + i_str, "");
+ strcpy( g_settings.network_nfs_dir[i] ,
configfile.getString("network_nfs_dir_" + i_str, "").c_str() );
+ strcpy( g_settings.network_nfs_local_dir[i] ,
configfile.getString("network_nfs_local_dir_" + i_str, "").c_str() );
+ g_settings.network_nfs_automount[i] =
configfile.getInt32 ("network_nfs_automount_" + i_str, 0);
+ g_settings.network_nfs_type[i] =
configfile.getInt32 ("network_nfs_type_" + i_str, 0);
+ strcpy( g_settings.network_nfs_username[i] ,
configfile.getString("network_nfs_username_" + i_str, "").c_str() );
+ strcpy( g_settings.network_nfs_password[i] ,
configfile.getString("network_nfs_password_" + i_str, "").c_str() );
+ strcpy( g_settings.network_nfs_mount_options1[i],
configfile.getString("network_nfs_mount_options1_" + i_str, "ro,soft,udp"
).c_str() );
+ strcpy( g_settings.network_nfs_mount_options2[i],
configfile.getString("network_nfs_mount_options2_" + i_str,
"nolock,rsize=8192,wsize=8192" ).c_str() );
+ strcpy( g_settings.network_nfs_mac[i] ,
configfile.getString("network_nfs_mac" + i_str, "11:22:33:44:55:66").c_str() );
}
g_settings.filesystem_is_utf8 =
configfile.getBool("filesystem_is_utf8" , true );
@@ -581,12 +571,10 @@ int CNeutrinoApp::loadSetup()
g_settings.recording_dir_permissions[3] = '\0';
for(int i=0 ; i < MAX_RECORDING_DIR ; i++)
{
- sprintf(cfg_key, "recording_dir_%d", i);
- g_settings.recording_dir[i] = configfile.getString( cfg_key, ""
);
- sprintf(cfg_key, "recording_filename_template_%d", i);
- g_settings.recording_filename_template[i] =
configfile.getString( cfg_key, "" );
- sprintf(cfg_key, "recording_splitsize_%d", i);
- strcpy(g_settings.recording_splitsize[i], configfile.getString(
cfg_key, "" ).c_str());
+ std::string i_str(to_string(i));
+ g_settings.recording_dir[i] =
configfile.getString("recording_dir_" + i_str, "" );
+ g_settings.recording_filename_template[i] =
configfile.getString("recording_filename_template_" + i_str, "" );
+ strcpy(g_settings.recording_splitsize[i],
configfile.getString("recording_splitsize_" + i_str, "" ).c_str());
}
g_settings.recording_gen_psi =
configfile.getBool("recordingmenu.gen_psi", true);
@@ -990,29 +978,19 @@ void CNeutrinoApp::saveSetup()
configfile.setBool( "menu_numbers_as_icons",
g_settings.menu_numbers_as_icons );
//network
- char cfg_key[81];
for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++)
{
- sprintf(cfg_key, "network_nfs_ip_%d", i);
- configfile.setString( cfg_key, g_settings.network_nfs_ip[i] );
- sprintf(cfg_key, "network_nfs_dir_%d", i);
- configfile.setString( cfg_key, g_settings.network_nfs_dir[i] );
- sprintf(cfg_key, "network_nfs_local_dir_%d", i);
- configfile.setString( cfg_key,
g_settings.network_nfs_local_dir[i] );
- sprintf(cfg_key, "network_nfs_automount_%d", i);
- configfile.setInt32( cfg_key,
g_settings.network_nfs_automount[i]);
- sprintf(cfg_key, "network_nfs_type_%d", i);
- configfile.setInt32( cfg_key, g_settings.network_nfs_type[i]);
- sprintf(cfg_key,"network_nfs_username_%d", i);
- configfile.setString( cfg_key,
g_settings.network_nfs_username[i] );
- sprintf(cfg_key, "network_nfs_password_%d", i);
- configfile.setString( cfg_key,
g_settings.network_nfs_password[i] );
- sprintf(cfg_key, "network_nfs_mount_options1_%d", i);
- configfile.setString( cfg_key,
g_settings.network_nfs_mount_options1[i]);
- sprintf(cfg_key, "network_nfs_mount_options2_%d", i);
- configfile.setString( cfg_key,
g_settings.network_nfs_mount_options2[i]);
- sprintf(cfg_key, "network_nfs_mac_%d", i);
- configfile.setString( cfg_key, g_settings.network_nfs_mac[i]);
+ std::string i_str(to_string(i));
+ configfile.setString("network_nfs_ip_" + i_str ,
g_settings.network_nfs_ip[i] );
+ configfile.setString("network_nfs_dir_" + i_str ,
g_settings.network_nfs_dir[i] );
+ configfile.setString("network_nfs_local_dir_" + i_str ,
g_settings.network_nfs_local_dir[i] );
+ configfile.setInt32 ("network_nfs_automount_" + i_str ,
g_settings.network_nfs_automount[i]);
+ configfile.setInt32 ("network_nfs_type_" + i_str ,
g_settings.network_nfs_type[i]);
+ configfile.setString("network_nfs_username_" + i_str ,
g_settings.network_nfs_username[i] );
+ configfile.setString("network_nfs_password_" + i_str ,
g_settings.network_nfs_password[i] );
+ configfile.setString("network_nfs_mount_options1_" + i_str,
g_settings.network_nfs_mount_options1[i]);
+ configfile.setString("network_nfs_mount_options2_" + i_str,
g_settings.network_nfs_mount_options2[i]);
+ configfile.setString("network_nfs_mac_" + i_str ,
g_settings.network_nfs_mac[i]);
}
configfile.setBool ( "filesystem_is_utf8" ,
g_settings.filesystem_is_utf8);
#ifdef ENABLE_SAMBASERVER
@@ -1103,12 +1081,10 @@ void CNeutrinoApp::saveSetup()
configfile.setString("recording_dir_permissions" ,
g_settings.recording_dir_permissions);
for(int i=0 ; i < MAX_RECORDING_DIR ; i++)
{
- sprintf(cfg_key, "recording_dir_%d", i);
- configfile.setString( cfg_key, g_settings.recording_dir[i] );
- sprintf(cfg_key, "recording_filename_template_%d", i);
- configfile.setString( cfg_key,
g_settings.recording_filename_template[i] );
- sprintf(cfg_key, "recording_splitsize_%d", i);
- configfile.setString( cfg_key,
g_settings.recording_splitsize[i] );
+ std::string i_str(to_string(i));
+ configfile.setString("recording_dir_" + i_str ,
g_settings.recording_dir[i] );
+ configfile.setString("recording_filename_template_" + i_str,
g_settings.recording_filename_template[i] );
+ configfile.setString("recording_splitsize_" + i_str ,
g_settings.recording_splitsize[i] );
}
//streaming
diff --git a/tuxbox/neutrino/src/system/helper.cpp
b/tuxbox/neutrino/src/system/helper.cpp
index cb7a065..1681c1b 100644
--- a/tuxbox/neutrino/src/system/helper.cpp
+++ b/tuxbox/neutrino/src/system/helper.cpp
@@ -153,3 +153,45 @@ std::string find_executable(const char *name)
}
return "";
}
+
+std::string to_string(int i)
+{
+ std::stringstream s;
+ s << i;
+ return s.str();
+}
+
+std::string to_string(unsigned int i)
+{
+ std::stringstream s;
+ s << i;
+ return s.str();
+}
+
+std::string to_string(long i)
+{
+ std::stringstream s;
+ s << i;
+ return s.str();
+}
+
+std::string to_string(unsigned long i)
+{
+ std::stringstream s;
+ s << i;
+ return s.str();
+}
+
+std::string to_string(long long i)
+{
+ std::stringstream s;
+ s << i;
+ return s.str();
+}
+
+std::string to_string(unsigned long long i)
+{
+ std::stringstream s;
+ s << i;
+ return s.str();
+}
diff --git a/tuxbox/neutrino/src/system/helper.h
b/tuxbox/neutrino/src/system/helper.h
index 8ccc836..f17c10b 100644
--- a/tuxbox/neutrino/src/system/helper.h
+++ b/tuxbox/neutrino/src/system/helper.h
@@ -26,6 +26,7 @@
#define __neutrino_helper__
#include <string>
+#include <sstream>
void StrSearchReplace( std::string &s, const std::string &to_find, const
std::string& repl_with );
@@ -36,4 +37,10 @@ bool file_exists(const char *filename);
std::string find_executable(const char *name);
+std::string to_string(int);
+std::string to_string(unsigned int);
+std::string to_string(long);
+std::string to_string(unsigned long);
+std::string to_string(long long);
+std::string to_string(unsigned long long);
#endif
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/src/gui/epgview.cpp | 7 +--
tuxbox/neutrino/src/neutrino.cpp | 84 ++++++++++++---------------------
tuxbox/neutrino/src/system/helper.cpp | 42 ++++++++++++++++
tuxbox/neutrino/src/system/helper.h | 7 +++
4 files changed, 81 insertions(+), 59 deletions(-)
--
Tuxbox-GIT: apps
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Tuxbox-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tuxbox-cvs-commits
