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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22dd798325
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-02-25 21:20:22 +01:00
parent 3ce8390843 f62fbd7b50
commit f5d3bb2d9f
8 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
View File

@@ -227,7 +227,7 @@ t_channel_id CNeutrinoAPI::ChannelNameToChannelId(std::string search_channel_nam
//-------------------------------------------------------------------------
// Get functions
//-------------------------------------------------------------------------
#if 0 /* unused funktion*/
bool CNeutrinoAPI::GetStreamInfo(int bitInfo[10])
{
char /* *key,*/ *tmpptr, buf[100];
@@ -261,7 +261,7 @@ bool CNeutrinoAPI::GetStreamInfo(int bitInfo[10])
return true;
}
#endif
//-------------------------------------------------------------------------
bool CNeutrinoAPI::GetChannelEvents(void)

2
src/nhttpd/tuxboxapi/coolstream/neutrinoapi.h
View File

@@ -53,7 +53,9 @@ class CNeutrinoAPI
// get functions to collect data
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);