loading and saving the cable transponders to lamedb works now

[enigma2.git] / lib / dvb / db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index ad2996f913fa7f1ca984c29494119b260d5eccdc..2d609bdc584217a2950959ca55c94bd0c56994b2 100644 (file)
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -107,6 +107,12 @@ err:
        return -1;
 }
 
+RESULT eBouquet::setListName(const std::string &name)
+{
+       m_bouquet_name = name;
+       return 0;
+}
+
 eDVBService::eDVBService()
 {
 }
@@ -312,9 +318,15 @@ void eDVBDB::reloadServicelist()
                                feparm->setDVBT(ter);
                        } else if (line[1]=='c')
                        {
+                               eDVBFrontendParametersCable cab;
                                int frequency, symbol_rate, inversion=0, modulation=3;
                                sscanf(line+2, "%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation);
-//                             t.setCable(frequency, symbol_rate, inversion, modulation);
+                               cab.frequency = frequency;
+                               cab.symbol_rate = symbol_rate;
+                               cab.modulation = modulation;
+                               cab.fec_inner = 6;
+                               cab.inversion = inversion;
+                               feparm->setDVBC(cab);
                        }
                }
                addChannelToList(channelid, feparm);
@@ -425,6 +437,7 @@ void eDVBDB::saveServicelist()
                                chid.transport_stream_id.get(), chid.original_network_id.get());
                eDVBFrontendParametersSatellite sat;
                eDVBFrontendParametersTerrestrial ter;
+               eDVBFrontendParametersCable cab;
                if (!ch.m_frontendParameters->getDVBS(sat))
                {
                        fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n",
@@ -440,6 +453,11 @@ void eDVBDB::saveServicelist()
                                ter.code_rate_LP, ter.modulation, ter.transmission_mode,
                                ter.guard_interval, ter.hierarchy, ter.inversion);
                }
+               if (!ch.m_frontendParameters->getDVBC(cab))
+               {
+                       fprintf(f, "\tc %d:%d:%d:%d\n",
+                               cab.frequency, cab.symbol_rate, cab.inversion, cab.modulation);
+               }
                fprintf(f, "/\n");
                channels++;
        }
@@ -615,7 +633,7 @@ void eDVBDB::reloadBouquets()
                memset(ref.data, 0, sizeof(ref.data));
                ref.type=1;
                ref.flags=7;
-               ref.data[0]=1;
+               ref.data[0]=2;
                ref.path="(type == 2) FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
                eBouquet &parent = m_bouquets["bouquets.radio"];
                parent.m_services.push_back(ref);