remove some debug prints
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Mon, 19 Dec 2005 01:52:12 +0000 (01:52 +0000)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Mon, 19 Dec 2005 01:52:12 +0000 (01:52 +0000)
this commit breaks enigma2... sorry... the automatic scan throws a "KeyError"
but the serviceselection looks nicer now :)

lib/dvb/db.cpp
lib/python/Components/NimManager.py

index 17196f0..a3a98c0 100644 (file)
@@ -857,7 +857,11 @@ eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference
                                char buf[64];
 // TODO get real satellite name..
 // but i dont like to parse the satellites.xml here.. and in the python part
                                char buf[64];
 // TODO get real satellite name..
 // but i dont like to parse the satellites.xml here.. and in the python part
-                               snprintf(buf, 64, "Services - %d", dvbnamespace>>16);
+                               int tpos = dvbnamespace>>16;
+                               if (tpos > 1800) // west
+                                       snprintf(buf, 64, "Services (%3.1fW)", (0 - (tpos - 3600)) / 10.0);
+                               else
+                                       snprintf(buf, 64, "Services (%3.1fE)", tpos / 10.0);
                                ref.name=buf;
                                snprintf(buf, 64, "(satellitePosition == %d) && ", dvbnamespace>>16);
                                ref.path=buf+source.path;
                                ref.name=buf;
                                snprintf(buf, 64, "(satellitePosition == %d) && ", dvbnamespace>>16);
                                ref.path=buf+source.path;
@@ -873,7 +877,10 @@ eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference
                                ref.path.erase(pos+5);
                                ref.path+="PROVIDERS ORDER BY name";
 //                             eDebug("ref.path now %s", ref.path.c_str());
                                ref.path.erase(pos+5);
                                ref.path+="PROVIDERS ORDER BY name";
 //                             eDebug("ref.path now %s", ref.path.c_str());
-                               snprintf(buf, 64, "Providers - %d", dvbnamespace>>16);
+                               if (tpos > 1800) // west
+                                       snprintf(buf, 64, "Providers (%3.1fW)", (0 - (tpos - 3600)) / 10.0);
+                               else
+                                       snprintf(buf, 64, "Providers (%3.1fE)", tpos / 10.0);
                                ref.name=buf;
                                m_list.push_back(ref);
                        }
                                ref.name=buf;
                                m_list.push_back(ref);
                        }
index 3bc47ec..183f9d2 100644 (file)
@@ -129,9 +129,7 @@ class NimManager:
                                #print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',""))
                                tpos = int(attrs.get('position',""))
                                if tpos < 0:
                                #print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',""))
                                tpos = int(attrs.get('position',""))
                                if tpos < 0:
-                                       print "negative"
                                        tpos = 3600 + tpos
                                        tpos = 3600 + tpos
-                               print "[NimManager.py] tpos:", tpos
                                tname = attrs.get('name',"")
                                self.satellites[tpos] = tname
                                self.satList.append( (tname, tpos) )
                                tname = attrs.get('name',"")
                                self.satellites[tpos] = tname
                                self.satList.append( (tname, tpos) )