diff --git a/src/zapit/include/zapit/client/zapitclient.h b/src/zapit/include/zapit/client/zapitclient.h index 1f9fa2441..f4df57f4e 100644 --- a/src/zapit/include/zapit/client/zapitclient.h +++ b/src/zapit/include/zapit/client/zapitclient.h @@ -287,10 +287,10 @@ class CZapitClient:public CBasicClient t_channel_id getCurrentServiceID(); /* return the current satellite position */ - int32_t getCurrentSatellitePosition(); + //int32_t getCurrentSatellitePosition(); /* get last channel-information */ - void getLastChannel(t_channel_id &channel_id, int &mode); + //void getLastChannel(t_channel_id &channel_id, int &mode); /* audiochan set */ void setAudioChannel(const unsigned int channel); @@ -319,11 +319,11 @@ class CZapitClient:public CBasicClient std::string getChannelName(const t_channel_id channel_id); /* is channel a TV channel ? */ - bool isChannelTVChannel(const t_channel_id channel_id); + //bool isChannelTVChannel(const t_channel_id channel_id); /* get the current_TP */ - bool get_current_TP(TP_params* TP); + //bool get_current_TP(TP_params* TP); /* restore bouquets so as if they where just loaded*/ void restoreBouquets(); @@ -398,7 +398,7 @@ class CZapitClient:public CBasicClient void setScanSatelliteList( ScanSatelliteList& satelliteList ); /* tell zapit stored satellite positions in diseqc 1.2 motor */ - void setScanMotorPosList( ScanMotorPosList& motorPosList ); + //void setScanMotorPosList( ScanMotorPosList& motorPosList ); /* set diseqcType*/ void setDiseqcType(const diseqc_t diseqc); @@ -410,10 +410,10 @@ class CZapitClient:public CBasicClient void setScanBouquetMode(const bouquetMode mode); /* set Scan-Type for channel search */ - void setScanType(const scanType mode); + //void setScanType(const scanType mode); /* get FrontEnd Signal Params */ - void getFESignal (struct responseFESignal& f); + //void getFESignal (struct responseFESignal& f); /****************************************/ /* */ @@ -437,7 +437,7 @@ class CZapitClient:public CBasicClient /* moves a channel of a bouquet from one position to another, channel lists begin at position=1*/ /* bouquets are numbered starting at 0 */ - void moveChannel(const unsigned int bouquet, unsigned int oldPos, unsigned int newPos, channelsMode mode = MODE_CURRENT); + //void moveChannel(const unsigned int bouquet, unsigned int oldPos, unsigned int newPos, channelsMode mode = MODE_CURRENT); // -- check if Bouquet-Name exists (2002-04-02 rasc) // -- Return bq_id or -1 @@ -448,7 +448,7 @@ class CZapitClient:public CBasicClient // -- check if Channel already in Bouquet (2002-04-05 rasc) // -- Return true/false /* bouquets are numbered starting at 0 */ - bool existsChannelInBouquet(const unsigned int bouquet, const t_channel_id channel_id); + //bool existsChannelInBouquet(const unsigned int bouquet, const t_channel_id channel_id); /* adds a channel at the end of then channel list to specified bouquet */ @@ -490,9 +490,9 @@ class CZapitClient:public CBasicClient void unlockPlayBack(); bool tune_TP(TP_params TP); bool isPlayBackActive(); - void setDisplayFormat(const video_display_format_t mode); + //void setDisplayFormat(const video_display_format_t mode); void setAudioMode(int mode); - void getAudioMode(int * mode); + //void getAudioMode(int * mode); void setVideoSystem(int video_system); void getAspectRatio(int *ratio); void setAspectRatio(int ratio); diff --git a/src/zapit/lib/zapitclient.cpp b/src/zapit/lib/zapitclient.cpp index bd93ea70d..a59bafe5b 100644 --- a/src/zapit/lib/zapitclient.cpp +++ b/src/zapit/lib/zapitclient.cpp @@ -678,6 +678,7 @@ void CZapitClient::setScanSatelliteList( ScanSatelliteList& satelliteList ) close_connection(); } +#if 0 /* tell zapit stored satellite positions in diseqc 1.2 motor */ void CZapitClient::setScanMotorPosList( ScanMotorPosList& motorPosList ) { @@ -689,6 +690,7 @@ void CZapitClient::setScanMotorPosList( ScanMotorPosList& motorPosList ) } close_connection(); } +#endif /* set diseqcType*/ void CZapitClient::setDiseqcType(const diseqc_t diseqc) @@ -711,13 +713,15 @@ void CZapitClient::setScanBouquetMode(const bouquetMode mode) close_connection(); } +#if 0 /* set Scan-TYpe for channelsearch */ void CZapitClient::setScanType(const scanType mode) { send(CZapitMessages::CMD_SCANSETTYPE, (const char *) & mode, sizeof(mode)); close_connection(); } - +#endif +#if 0 // // -- query Frontend Signal parameters // @@ -734,7 +738,7 @@ void CZapitClient::getFESignal (struct responseFESignal &f) close_connection(); } - +#endif /***********************************************/ /* */ @@ -806,6 +810,7 @@ signed int CZapitClient::existsBouquet(const char * const name) return response.number; } +#if 0 // -- check if Channel already is in Bouquet // -- Return: true/false /* bouquets are numbered starting at 0 */ @@ -823,9 +828,9 @@ bool CZapitClient::existsChannelInBouquet(const unsigned int bouquet, const t_ch close_connection(); return (unsigned int) response.status; } +#endif - - +#if 0 /* moves a channel of a bouquet from one position to another, channel lists begin at position=1*/ /* bouquets are numbered starting at 0 */ void CZapitClient::moveChannel( unsigned int bouquet, unsigned int oldPos, unsigned int newPos, channelsMode mode) @@ -841,6 +846,7 @@ void CZapitClient::moveChannel( unsigned int bouquet, unsigned int oldPos, unsig close_connection(); } +#endif /* adds a channel at the end of then channel list to specified bouquet */ /* same channels can be in more than one bouquet */ @@ -943,7 +949,6 @@ void CZapitClient::setVideoSystem(int video_system) close_connection(); } - void CZapitClient::startPlayBack() { send(CZapitMessages::CMD_SB_START_PLAYBACK); @@ -972,6 +977,7 @@ void CZapitClient::unlockPlayBack() CBasicClient::receive_data((char* )&response, sizeof(response)); close_connection(); } + bool CZapitClient::isPlayBackActive() { send(CZapitMessages::CMD_SB_GET_PLAYBACK_ACTIVE); @@ -982,7 +988,7 @@ bool CZapitClient::isPlayBackActive() close_connection(); return response.activated; } - +#if 0 void CZapitClient::setDisplayFormat(const video_display_format_t format) { CZapitMessages::commandInt msg; @@ -990,7 +996,7 @@ void CZapitClient::setDisplayFormat(const video_display_format_t format) send(CZapitMessages::CMD_SET_DISPLAY_FORMAT, (char*)&msg, sizeof(msg)); close_connection(); } - +#endif void CZapitClient::setAudioMode(const int mode) { CZapitMessages::commandInt msg;