-reduce globale

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1132 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-02-09 11:43:30 +00:00
parent 6819701b2f
commit 13bdfc4c50

View File

@@ -114,12 +114,8 @@ extern cVideo * videoDecoder;
#define AUDIOPLAYER_END_SCRIPT CONFIGDIR "/audioplayer.end" #define AUDIOPLAYER_END_SCRIPT CONFIGDIR "/audioplayer.end"
#define DEFAULT_RADIOSTATIONS_XMLFILE CONFIGDIR "/radio-stations.xml" #define DEFAULT_RADIOSTATIONS_XMLFILE CONFIGDIR "/radio-stations.xml"
const long int GET_PLAYLIST_TIMEOUT = 10;
const char RADIO_STATION_XML_FILE[] = {DEFAULT_RADIOSTATIONS_XMLFILE}; const char RADIO_STATION_XML_FILE[] = {DEFAULT_RADIOSTATIONS_XMLFILE};
const std::string icecasturl = "http://dir.xiph.org/yp.xml";
const long int GET_ICECAST_TIMEOUT = 90; // list is about 500kB!
CAudiofileExt::CAudiofileExt() CAudiofileExt::CAudiofileExt()
: CAudiofile(), firstChar('\0') : CAudiofile(), firstChar('\0')
{ {
@@ -988,6 +984,7 @@ void CAudioPlayerGui::addUrl2Playlist(const char *url, const char *name, const t
void CAudioPlayerGui::processPlaylistUrl(const char *url, const char *name, const time_t tim) { void CAudioPlayerGui::processPlaylistUrl(const char *url, const char *name, const time_t tim) {
CURL *curl_handle; CURL *curl_handle;
struct MemoryStruct chunk; struct MemoryStruct chunk;
const long int GET_PLAYLIST_TIMEOUT = 10;
printf("CAudioPlayerGui::processPlaylistUrl (%s, %s)\n", url, name); printf("CAudioPlayerGui::processPlaylistUrl (%s, %s)\n", url, name);
chunk.memory=NULL; /* we expect realloc(NULL, size) to work */ chunk.memory=NULL; /* we expect realloc(NULL, size) to work */
@@ -1073,6 +1070,9 @@ void CAudioPlayerGui::processPlaylistUrl(const char *url, const char *name, cons
void CAudioPlayerGui::readDir_ic(void) void CAudioPlayerGui::readDir_ic(void)
{ {
const std::string icecasturl = "http://dir.xiph.org/yp.xml";
const long int GET_ICECAST_TIMEOUT = 90; // list is about 500kB!
std::string answer=""; std::string answer="";
std::cout << "[readDir_ic] IC URL: " << icecasturl << std::endl; std::cout << "[readDir_ic] IC URL: " << icecasturl << std::endl;
CURL *curl_handle; CURL *curl_handle;