Advertisement
Guest User

Untitled

a guest
Mar 28th, 2013
32
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C++ 2.80 KB | None | 0 0
  1. diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
  2. index 2311456..a54e71e 100644
  3. --- a/mythtv/libs/libmythtv/videosource.cpp
  4. +++ b/mythtv/libs/libmythtv/videosource.cpp
  5. @@ -2451,55 +2451,55 @@ CardType::CardType(const CaptureCard &parent) :
  6.  
  7.  void CardType::fillSelections(SelectSetting* setting)
  8.  {
  9. -#ifdef USING_V4L2
  10. -    setting->addSelection(
  11. -        QObject::tr("Analog V4L capture card"), "V4L");
  12. -    setting->addSelection(
  13. -        QObject::tr("MJPEG capture card (Matrox G200, DC10)"), "MJPEG");
  14. -# ifdef USING_IVTV
  15. +#ifdef USING_DVB
  16.      setting->addSelection(
  17. -        QObject::tr("MPEG-2 encoder card"), "MPEG");
  18. -# endif // USING_IVTV
  19. +        QObject::tr("DVB-T/S/C, ATSC or ISDB-T DTV tuner card"), "DVB");
  20. +#endif // USING_DVB
  21. +
  22. +#ifdef USING_V4L2
  23.  # ifdef USING_HDPVR
  24.      setting->addSelection(
  25.          QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR");
  26.  # endif // USING_HDPVR
  27.  #endif // USING_V4L2
  28.  
  29. -#ifdef USING_DVB
  30. +#ifdef USING_HDHOMERUN
  31.      setting->addSelection(
  32. -        QObject::tr("DVB DTV capture card (v3.x)"), "DVB");
  33. -#endif // USING_DVB
  34. -
  35. +        QObject::tr("HDHomeRun DTV networked tuner"), "HDHOMERUN");
  36. +#endif // USING_HDHOMERUN
  37. +    
  38.  #ifdef USING_FIREWIRE
  39.      setting->addSelection(
  40.          QObject::tr("FireWire cable box"), "FIREWIRE");
  41.  #endif // USING_FIREWIRE
  42.  
  43. -#ifdef USING_V4L2
  44. -    setting->addSelection(
  45. -        QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"),
  46. -        "GO7007");
  47. -#endif // USING_V4L2
  48. -
  49. -#ifdef USING_HDHOMERUN
  50. +#ifdef USING_CETON
  51.      setting->addSelection(
  52. -        QObject::tr("HDHomeRun DTV tuner box"), "HDHOMERUN");
  53. -#endif // USING_HDHOMERUN
  54. +        QObject::tr("Ceton Cablecard tuner"), "CETON");
  55. +#endif // USING_CETON
  56.  
  57.  #ifdef USING_IPTV
  58.      setting->addSelection(QObject::tr("IPTV recorder"), "FREEBOX");
  59.  #endif // USING_IPTV
  60.  
  61. +#ifdef USING_V4L2
  62. +# ifdef USING_IVTV
  63. +    setting->addSelection(
  64. +        QObject::tr("Analog to MPEG-2 encoder card (PVR-150/250/350, etc)"), "MPEG");
  65. +# endif // USING_IVTV
  66. +    setting->addSelection(
  67. +        QObject::tr("Analog to MJPEG encoder card (Matrox G200, DC10, etc)"), "MJPEG");
  68. +    setting->addSelection(
  69. +        QObject::tr("Analog to MPEG-4 encoder (Plextor ConvertX USB, etc)"),
  70. +        "GO7007");
  71. +    setting->addSelection(
  72. +        QObject::tr("Analog capture card"), "V4L");
  73. +#endif // USING_V4L2
  74. +
  75.  #ifdef USING_ASI
  76.      setting->addSelection(QObject::tr("DVEO ASI recorder"), "ASI");
  77.  #endif
  78.  
  79. -#ifdef USING_CETON
  80. -    setting->addSelection(
  81. -        QObject::tr("Ceton Cablecard tuner "), "CETON");
  82. -#endif // USING_CETON
  83. -
  84.      setting->addSelection(QObject::tr("Import test recorder"), "IMPORT");
  85.      setting->addSelection(QObject::tr("Demo test recorder"),   "DEMO");
  86.  }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement