Permalink
Browse files

Reorder and rename the choices in the capture card combo box

To try and reduce some confusion and common mis-configuration the descriptions and order of the options has been changed. The most commonly used options are listed first, through to the least used and similar or related choices are grouped together. Incorrect descriptions such as 'DVB Capture' are replaced by more descriptive strings e.g. 'DVB-T/S/C, ATSC or ISDB-T tuner card'
  • Loading branch information...
1 parent 77737e1 commit 536b7c1a02639c4ee8fa8bb53a511a2e751ed461 @stuartm stuartm committed Mar 28, 2013
Showing with 27 additions and 27 deletions.
  1. +27 −27 mythtv/libs/libmythtv/videosource.cpp
@@ -2451,55 +2451,55 @@ CardType::CardType(const CaptureCard &parent) :
void CardType::fillSelections(SelectSetting* setting)
{
-#ifdef USING_V4L2
- setting->addSelection(
- QObject::tr("Analog V4L capture card"), "V4L");
- setting->addSelection(
- QObject::tr("MJPEG capture card (Matrox G200, DC10)"), "MJPEG");
-# ifdef USING_IVTV
+#ifdef USING_DVB
setting->addSelection(
- QObject::tr("MPEG-2 encoder card"), "MPEG");
-# endif // USING_IVTV
+ QObject::tr("DVB-T/S/C, ATSC or ISDB-T tuner card"), "DVB");
+#endif // USING_DVB
+
+#ifdef USING_V4L2
# ifdef USING_HDPVR
setting->addSelection(
- QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR");
+ QObject::tr("HD-PVR H.264 encoder"), "HDPVR");
# endif // USING_HDPVR
#endif // USING_V4L2
-#ifdef USING_DVB
+#ifdef USING_HDHOMERUN
setting->addSelection(
- QObject::tr("DVB DTV capture card (v3.x)"), "DVB");
-#endif // USING_DVB
-
+ QObject::tr("HDHomeRun networked tuner"), "HDHOMERUN");
+#endif // USING_HDHOMERUN
+
#ifdef USING_FIREWIRE
setting->addSelection(
QObject::tr("FireWire cable box"), "FIREWIRE");
#endif // USING_FIREWIRE
-#ifdef USING_V4L2
- setting->addSelection(
- QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"),
- "GO7007");
-#endif // USING_V4L2
-
-#ifdef USING_HDHOMERUN
+#ifdef USING_CETON
setting->addSelection(
- QObject::tr("HDHomeRun DTV tuner box"), "HDHOMERUN");
-#endif // USING_HDHOMERUN
+ QObject::tr("Ceton Cablecard tuner"), "CETON");
+#endif // USING_CETON
#ifdef USING_IPTV
setting->addSelection(QObject::tr("IPTV recorder"), "FREEBOX");
#endif // USING_IPTV
+#ifdef USING_V4L2
+# ifdef USING_IVTV
+ setting->addSelection(
+ QObject::tr("Analog to MPEG-2 encoder card (PVR-150/250/350, etc)"), "MPEG");
+# endif // USING_IVTV
+ setting->addSelection(
+ QObject::tr("Analog to MJPEG encoder card (Matrox G200, DC10, etc)"), "MJPEG");
+ setting->addSelection(
+ QObject::tr("Analog to MPEG-4 encoder (Plextor ConvertX USB, etc)"),
+ "GO7007");
+ setting->addSelection(
+ QObject::tr("Analog capture card"), "V4L");
+#endif // USING_V4L2
+
#ifdef USING_ASI
setting->addSelection(QObject::tr("DVEO ASI recorder"), "ASI");
#endif
-#ifdef USING_CETON
- setting->addSelection(
- QObject::tr("Ceton Cablecard tuner "), "CETON");
-#endif // USING_CETON
-
setting->addSelection(QObject::tr("Import test recorder"), "IMPORT");
setting->addSelection(QObject::tr("Demo test recorder"), "DEMO");
}

0 comments on commit 536b7c1

Please sign in to comment.