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

change 'long long' tom int64_t'; change variable buf to new delete;

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@291 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 8f59cc96ec
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-07 (Sun, 07 Feb 2010)
This commit is contained in:
Jacek Jendrzej
2010-02-07 14:32:21 +00:00
parent 780e67bbc1
commit 9819856e7d
43 changed files with 202 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/filebrowser.cpp
View File

@@ -555,7 +555,7 @@ bool CFileBrowser::readDir_vlc(const std::string & dirname, CFileList* flist)
curl_easy_cleanup(curl_handle);
// std::cout << "Answer:" << std::endl << "----------------" << std::endl << answer << std::endl;
if (!answer.empty() && httpres == 0)
{
xmlDocPtr answer_parser = parseXml(answer.c_str());
@@ -583,9 +583,9 @@ bool CFileBrowser::readDir_vlc(const std::string & dirname, CFileList* flist)
file.Name = dirname + xmlGetAttribute(element, "name");
ptr = xmlGetAttribute(element, "size");
if (ptr)
if (ptr)
file.Size = atoi(ptr);
else
else
file.Size = 0;
file.Time = 0;
@@ -597,7 +597,7 @@ bool CFileBrowser::readDir_vlc(const std::string & dirname, CFileList* flist)
return true;
}
}
/* since all CURL error messages use only US-ASCII characters, when can safely print them as if they were UTF-8 encoded */
if (httpres == 22) {
strcat(error, "\nProbably wrong vlc version\nPlease use vlc 0.8.5 or higher");
@@ -676,7 +676,7 @@ and add to neutrino playlist
curl_easy_cleanup(curl_handle);
//std::cout << "Answer:" << std::endl << "----------------" << std::endl << answer << std::endl;
if (!answer.empty() && httpres == 0)
{
printf("CFileBrowser::readDir_sc: read done, size %d\n", answer.size());
@@ -687,9 +687,9 @@ printf("CFileBrowser::readDir_sc: read done, size %d\n", answer.size());
unsigned char xml_decode = 0;
xmlNodePtr element = xmlDocGetRootElement(answer_parser);
if (strcmp(xmlGetName(element), "genrelist") == 0)
if (strcmp(xmlGetName(element), "genrelist") == 0)
xml_decode = 1;
else if (strcmp(xmlGetName(element), "stationlist") == 0)
else if (strcmp(xmlGetName(element), "stationlist") == 0)
xml_decode = 2;
element = element->xmlChildrenNode;
@@ -765,7 +765,7 @@ printf("CFileBrowser::readDir_sc: read done, size %d\n", answer.size());
return true;
}
}
/* since all CURL error messages use only US-ASCII characters, when can safely print them as if they were UTF-8 encoded */
if (httpres == 22) {
strcat(error, "\nProbably wrong link.");
@@ -851,7 +851,7 @@ bool CFileBrowser::exec(const char * const dirname)
int oldselected = selected;
unsigned long long timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER]);
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER]);
bool loop=true;
while (loop)
@@ -954,7 +954,7 @@ bool CFileBrowser::exec(const char * const dirname)
#ifdef ENABLE_INTERNETRADIO
if (m_Mode == ModeSC) {
ChangeDir(filelist[selected].Url);
} else
} else
#endif
{
if (filelist[selected].getFileName() != "..") {
@@ -1314,7 +1314,7 @@ void CFileBrowser::paintItem(unsigned int pos)
#define KILOBYTE 1024LL
char tmpstr[256];
const char *unit = "";
long long factor = 0;
int64_t factor = 0;
if (actual_file->Size >= GIGABYTE)
{
factor = GIGABYTE;