diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 30d0874cc..284663c89 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -3583,14 +3583,13 @@ std::string CControlAPI::getSubdirectories(CyhookHandler *hh, std::string path, //----------------------------------------------------------------------------- void CControlAPI::getMoviesCGI(CyhookHandler *hh) { std::string result = ""; - bool isFirstLine = true; bool subdirs = true; if(hh->ParamList["subdirs"] == "false") { subdirs = false; } - TOutType outType = hh->outStart(); + hh->outStart(); //Shows all movies with path in moviebrowser.conf if (hh->ParamList["dir"] == "moviedir" || hh->ParamList["dir"] == "allmoviedirs" ) { diff --git a/src/nhttpd/tuxboxapi/neutrinoapi.cpp b/src/nhttpd/tuxboxapi/neutrinoapi.cpp index b519f5f5f..82e2100cd 100644 --- a/src/nhttpd/tuxboxapi/neutrinoapi.cpp +++ b/src/nhttpd/tuxboxapi/neutrinoapi.cpp @@ -309,7 +309,7 @@ std::string CNeutrinoAPI::GetServiceName(t_channel_id channel_id) } //------------------------------------------------------------------------- - +#if 0 //never used CZapitClient::BouquetChannelList *CNeutrinoAPI::GetBouquet(unsigned int, int) { //FIXME @@ -337,7 +337,7 @@ void CNeutrinoAPI::UpdateChannelList(void) { //FIXME } - +#endif //------------------------------------------------------------------------- std::string CNeutrinoAPI::timerEventType2Str(CTimerd::CTimerEventTypes type) diff --git a/src/nhttpd/tuxboxapi/neutrinoapi.h b/src/nhttpd/tuxboxapi/neutrinoapi.h index fc3f8483e..1685d5874 100644 --- a/src/nhttpd/tuxboxapi/neutrinoapi.h +++ b/src/nhttpd/tuxboxapi/neutrinoapi.h @@ -61,10 +61,12 @@ public: bool GetChannelEvents(void); #if 0 /* unused funktion*/ bool GetStreamInfo(int bitinfo[10]); -#endif - std::string GetServiceName(t_channel_id channel_id); CZapitClient::BouquetChannelList *GetBouquet(unsigned int BouquetNr, int Mode); CZapitClient::BouquetChannelList *GetChannelList(int Mode); + void UpdateBouquet(unsigned int BouquetNr); + void UpdateChannelList(void); +#endif + std::string GetServiceName(t_channel_id channel_id); // support functions void ZapTo (const char * const target); @@ -72,8 +74,6 @@ public: void ZapToChannelId (t_channel_id channel_id); t_channel_id ChannelNameToChannelId(std::string search_channel_name); - void UpdateBouquet(unsigned int BouquetNr); - void UpdateChannelList(void); void UpdateBouquets(void); std::string timerEventType2Str(CTimerd::CTimerEventTypes type); diff --git a/src/nhttpd/yhttpd_core/ysocket.cpp b/src/nhttpd/yhttpd_core/ysocket.cpp index 4b3f4c6cf..93b1af233 100644 --- a/src/nhttpd/yhttpd_core/ysocket.cpp +++ b/src/nhttpd/yhttpd_core/ysocket.cpp @@ -291,6 +291,7 @@ int CySocket::Send(char const *buffer, unsigned int length) { BytesSend += len; return len; } +#if 0 //never used //----------------------------------------------------------------------------- // Check if Socket was closed by client //----------------------------------------------------------------------------- @@ -303,7 +304,7 @@ bool CySocket::CheckSocketOpen() { return !(recv(sock, buffer, sizeof(buffer), MSG_PEEK | MSG_DONTWAIT) == 0); #endif } - +#endif //============================================================================= // Aggregated Send- and Receive- Operations //============================================================================= diff --git a/src/nhttpd/yhttpd_core/ysocket.h b/src/nhttpd/yhttpd_core/ysocket.h index 8cd1b172e..06396b4c0 100644 --- a/src/nhttpd/yhttpd_core/ysocket.h +++ b/src/nhttpd/yhttpd_core/ysocket.h @@ -68,8 +68,9 @@ public: // send & receive (basic) int Read(char *buffer, unsigned int length); // Read a buffer (normal or SSL) int Send(char const *buffer, unsigned int length); // Send a buffer (normal or SSL) +#if 0 //#endif bool CheckSocketOpen(); // check if socket was closed by client - +#endif // send & receive bool SendFile(int filed, off_t start = 0, off_t size = -1); // Send a File std::string ReceiveBlock(); // receive a Block. Look at length