mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-03 10:51:12 +02:00
- streaminfo2: clean up from unused code
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -1232,7 +1232,6 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
|
|||||||
|
|
||||||
std::string casys[NUM_CAIDS] = {"Irdeto:", "Betacrypt:", "Seca:", "Viaccess:", "Nagra:", "Conax: ", "Cryptoworks:", "Videoguard:", "Biss:", "DreCrypt:", "PowerVU:", "Tandberg:"};
|
std::string casys[NUM_CAIDS] = {"Irdeto:", "Betacrypt:", "Seca:", "Viaccess:", "Nagra:", "Conax: ", "Cryptoworks:", "Videoguard:", "Biss:", "DreCrypt:", "PowerVU:", "Tandberg:"};
|
||||||
bool caids[NUM_CAIDS];
|
bool caids[NUM_CAIDS];
|
||||||
int array[NUM_CAIDS];
|
|
||||||
char tmp[100];
|
char tmp[100];
|
||||||
|
|
||||||
CZapitChannel *channel = CZapit::getInstance()->GetCurrentChannel();
|
CZapitChannel *channel = CZapit::getInstance()->GetCurrentChannel();
|
||||||
@@ -1241,7 +1240,6 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
|
|||||||
|
|
||||||
for (int i = 0; i < NUM_CAIDS; i++)
|
for (int i = 0; i < NUM_CAIDS; i++)
|
||||||
{
|
{
|
||||||
array[i] = g_FixedFont[font_small]->getRenderWidth(casys[i]);
|
|
||||||
caids[i] = false;
|
caids[i] = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1260,8 +1258,6 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
|
|||||||
fclose(f);
|
fclose(f);
|
||||||
}
|
}
|
||||||
|
|
||||||
int off = 0;
|
|
||||||
|
|
||||||
for (casys_map_iterator_t it = channel->camap.begin(); it != channel->camap.end(); ++it)
|
for (casys_map_iterator_t it = channel->camap.begin(); it != channel->camap.end(); ++it)
|
||||||
{
|
{
|
||||||
int idx = -1;
|
int idx = -1;
|
||||||
@@ -1311,12 +1307,9 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
|
|||||||
snprintf(tmp, sizeof(tmp), " 0x%04X", (*it));
|
snprintf(tmp, sizeof(tmp), " 0x%04X", (*it));
|
||||||
casys[idx] += tmp;
|
casys[idx] += tmp;
|
||||||
caids[idx] = true;
|
caids[idx] = true;
|
||||||
if (off < array[idx])
|
|
||||||
off = array[idx];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
off += OFFSET_INNER_SMALL;
|
|
||||||
bool cryptsystems = true;
|
bool cryptsystems = true;
|
||||||
for (int ca_id = 0; ca_id < NUM_CAIDS; ca_id++)
|
for (int ca_id = 0; ca_id < NUM_CAIDS; ca_id++)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user