X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5ff227c657e02ebe2bc719faf4bd2231a04850c8..f995ffff71d819416a89c1bec3ceb69d121daa4e:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index e0fadc5e..19339470 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -314,13 +314,21 @@ void eDVBDB::reloadServicelist()
 				ter.guard_interval = guard_interval;
 				ter.hierarchy = hierarchy;
 				ter.inversion = inversion;
-
 				feparm->setDVBT(ter);
 			} else if (line[1]=='c')
 			{
-				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);
+				eDVBFrontendParametersCable cab;
+				int frequency, symbol_rate,
+					inversion=eDVBFrontendParametersCable::Inversion::Unknown,
+					modulation=eDVBFrontendParametersCable::Modulation::Auto,
+					fec_inner=eDVBFrontendParametersCable::FEC::fAuto;
+				sscanf(line+2, "%d:%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation, &fec_inner);
+				cab.frequency = frequency;
+				cab.fec_inner = fec_inner;
+				cab.inversion = inversion;
+				cab.symbol_rate = symbol_rate;
+				cab.modulation = modulation;
+				feparm->setDVBC(cab);
 			}
 		}
 		addChannelToList(channelid, feparm);
@@ -431,6 +439,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",
@@ -446,6 +455,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:%d\n",
+				cab.frequency, cab.symbol_rate, cab.inversion, cab.modulation, cab.fec_inner);
+		}
 		fprintf(f, "/\n");
 		channels++;
 	}
@@ -621,7 +635,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);