mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-09 22:58:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit: change lastChannelRadio/lastChannelTV from number to channel_id

Browse Source
This commit is contained in:
[CST] Focus
2012-03-13 14:05:53 +04:00
parent 05f60857d1
commit 866b7e7b45
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/zapit/include/zapit/client/zapitclient.h
View File

@@ -139,8 +139,8 @@ class CZapitClient:public CBasicClient
struct responseGetLastChannel struct responseGetLastChannel
{ {
unsigned int channelNumber; t_channel_id channel_id;
char mode; int mode;
}; };
struct responseGetBouquets struct responseGetBouquets
@@ -290,7 +290,7 @@ class CZapitClient:public CBasicClient
int32_t getCurrentSatellitePosition(); int32_t getCurrentSatellitePosition();
/* get last channel-information */ /* get last channel-information */
void getLastChannel(unsigned int &channumber, char &mode); void getLastChannel(t_channel_id &channel_id, int &mode);
/* audiochan set */ /* audiochan set */
void setAudioChannel(const unsigned int channel); void setAudioChannel(const unsigned int channel);

4
src/zapit/include/zapit/zapit.h
View File

@@ -87,8 +87,8 @@ class CZapit : public OpenThreads::Thread
audio_map_t audio_map; audio_map_t audio_map;
bool current_is_nvod; bool current_is_nvod;
bool standby; bool standby;
uint32_t lastChannelRadio; t_channel_id lastChannelRadio;
uint32_t lastChannelTV; t_channel_id lastChannelTV;
int abort_zapit; int abort_zapit;
int pmt_update_fd; int pmt_update_fd;

4
src/zapit/lib/zapitclient.cpp
View File

@@ -106,13 +106,13 @@ CZapitClient::CCurrentServiceInfo CZapitClient::getCurrentServiceInfo()
return response; return response;
} }
void CZapitClient::getLastChannel(unsigned int &channumber, char &mode) void CZapitClient::getLastChannel(t_channel_id &channel_id, int &mode)
{ {
send(CZapitMessages::CMD_GET_LAST_CHANNEL); send(CZapitMessages::CMD_GET_LAST_CHANNEL);
CZapitClient::responseGetLastChannel response; CZapitClient::responseGetLastChannel response;
CBasicClient::receive_data((char* )&response, sizeof(response)); CBasicClient::receive_data((char* )&response, sizeof(response));
channumber = response.channelNumber + 1; channel_id = response.channel_id;
mode = response.mode; mode = response.mode;
close_connection(); close_connection();

25
src/zapit/src/zapit.cpp
View File

@@ -145,6 +145,7 @@ void CZapit::SendEvent(const unsigned int eventID, const void* eventbody, const
void CZapit::SaveSettings(bool write) void CZapit::SaveSettings(bool write)
{ {
if (current_channel) { if (current_channel) {
#if 0
// now save the lowest channel number with the current channel_id // now save the lowest channel number with the current channel_id
int c = ((currentMode & RADIO_MODE) ? g_bouquetManager->radioChannelsBegin() : g_bouquetManager->tvChannelsBegin()).getLowestChannelNumberWithChannelID(current_channel->getChannelID()); int c = ((currentMode & RADIO_MODE) ? g_bouquetManager->radioChannelsBegin() : g_bouquetManager->tvChannelsBegin()).getLowestChannelNumberWithChannelID(current_channel->getChannelID());
//printf("LAST CHAN %d !!!!!!!!!!!\n\n\n", c); //printf("LAST CHAN %d !!!!!!!!!!!\n\n\n", c);
@@ -155,14 +156,19 @@ void CZapit::SaveSettings(bool write)
else else
lastChannelTV = c; lastChannelTV = c;
} }
#endif
if ((currentMode & RADIO_MODE))
lastChannelRadio = current_channel->getChannelID();
else
lastChannelTV = current_channel->getChannelID();
} }
if (write) { if (write) {
configfile.setBool("saveLastChannel", config.saveLastChannel); configfile.setBool("saveLastChannel", config.saveLastChannel);
if (config.saveLastChannel) { if (config.saveLastChannel) {
configfile.setInt32("lastChannelMode", (currentMode & RADIO_MODE) ? 1 : 0); configfile.setInt32("lastChannelMode", (currentMode & RADIO_MODE) ? 1 : 0);
configfile.setInt32("lastChannelRadio", lastChannelRadio); configfile.setInt64("lastChannelRadio", lastChannelRadio);
configfile.setInt32("lastChannelTV", lastChannelTV); configfile.setInt64("lastChannelTV", lastChannelTV);
configfile.setInt64("lastChannel", live_channel_id); configfile.setInt64("lastChannel", live_channel_id);
} }
@@ -253,8 +259,8 @@ void CZapit::LoadSettings()
WARN("%s not found", CONFIGFILE); WARN("%s not found", CONFIGFILE);
live_channel_id = configfile.getInt64("lastChannel", 0); live_channel_id = configfile.getInt64("lastChannel", 0);
lastChannelRadio = configfile.getInt32("lastChannelRadio", 0); lastChannelRadio = configfile.getInt64("lastChannelRadio", 0);
lastChannelTV = configfile.getInt32("lastChannelTV", 0); lastChannelTV = configfile.getInt64("lastChannelTV", 0);
#if 0 //unused #if 0 //unused
config.fastZap = configfile.getBool("fastZap", 1); config.fastZap = configfile.getBool("fastZap", 1);
@@ -665,9 +671,6 @@ void CZapit::SetTVMode(void)
int CZapit::getMode(void) int CZapit::getMode(void)
{ {
int mode = currentMode & (~RECORD_MODE);
return mode;
if (currentMode & TV_MODE) if (currentMode & TV_MODE)
return CZapitClient::MODE_TV; return CZapitClient::MODE_TV;
if (currentMode & RADIO_MODE) if (currentMode & RADIO_MODE)
@@ -792,8 +795,8 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd)
case CZapitMessages::CMD_GET_LAST_CHANNEL: { case CZapitMessages::CMD_GET_LAST_CHANNEL: {
CZapitClient::responseGetLastChannel lastchannel; CZapitClient::responseGetLastChannel lastchannel;
lastchannel.channelNumber = (currentMode & RADIO_MODE) ? lastChannelRadio : lastChannelTV; lastchannel.channel_id = (currentMode & RADIO_MODE) ? lastChannelRadio : lastChannelTV;
lastchannel.mode = (currentMode & RADIO_MODE) ? 'r' : 't'; lastchannel.mode = getMode();
CBasicServer::send_data(connfd, &lastchannel, sizeof(lastchannel)); // bouquet & channel number are already starting at 0! CBasicServer::send_data(connfd, &lastchannel, sizeof(lastchannel)); // bouquet & channel number are already starting at 0!
break; break;
} }
@@ -2023,8 +2026,8 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
if(ZapStart_arg->uselastchannel == 0){ if(ZapStart_arg->uselastchannel == 0){
live_channel_id = (currentMode & RADIO_MODE) ? ZapStart_arg->startchannelradio_id : ZapStart_arg->startchanneltv_id ; live_channel_id = (currentMode & RADIO_MODE) ? ZapStart_arg->startchannelradio_id : ZapStart_arg->startchanneltv_id ;
lastChannelRadio = ZapStart_arg->startchannelradio_nr; lastChannelRadio = ZapStart_arg->startchannelradio_id;
lastChannelTV = ZapStart_arg->startchanneltv_nr; lastChannelTV = ZapStart_arg->startchanneltv_id;
} }
/* CA_INIT_CI or CA_INIT_SC or CA_INIT_BOTH */ /* CA_INIT_CI or CA_INIT_SC or CA_INIT_BOTH */