This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: Revert "v4l2-ctl: Add support for printing band info to G_TUNER / G_MODULATOR code" Author: Hans Verkuil <[email protected]> Date: Fri Jun 29 13:52:23 2012 +0200 This reverts commit 7590300afb1c809ca84f58f925653d84422c49ad. The multiband support is going to be implemented differently. Signed-off-by: Hans Verkuil <[email protected]> (cherry picked from commit 72df718d2b6e8b5dc433cc015c4ba5431d4d9568) Signed-off-by: Gregor Jasny <[email protected]> utils/v4l2-ctl/v4l2-ctl.cpp | 57 ------------------------------------------- 1 files changed, 0 insertions(+), 57 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=9b15c0d54218eaf35b47798013ce731e0e3c316f diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp index c15dcc5..998ff89 100644 --- a/utils/v4l2-ctl/v4l2-ctl.cpp +++ b/utils/v4l2-ctl/v4l2-ctl.cpp @@ -46,8 +46,6 @@ #include <string> #include <algorithm> -#define ARRAY_SIZE(arr) ((int)(sizeof(arr) / sizeof((arr)[0]))) - /* Short option list Please keep in alphabetical order. @@ -1519,49 +1517,6 @@ static std::string txsubchans2s(int txsubchans) return s; } -static const char *band_names[] = { - "default", - "fm-eur_us", - "fm-japan", - "fm-russian", - "fm-weather", - "am-mw", -}; - -static const char *band2s(unsigned band) -{ - if (band >= ARRAY_SIZE(band_names)) - return "Unknown"; - - return band_names[band]; -} - -static int s2band(const char *s) { - int i; - - for (i = 0; i < ARRAY_SIZE(band_names); i++) { - if (!strcmp(s, band_names[i])) - return i; - } - - return -1; -} - -static std::string tcap2bands(unsigned cap) { - std::string s; - int i; - - for (i = 1; i < ARRAY_SIZE(band_names); i++) { - if (cap & (V4L2_TUNER_CAP_BAND_FM_EUROPE_US << (i - 1))) { - if (s.length()) - s += " "; - s += band_names[i]; - } - } - - return s; -} - static std::string tcap2s(unsigned cap) { std::string s; @@ -3994,12 +3949,6 @@ int main(int argc, char **argv) printf("Tuner %d:\n", vt.index); printf("\tName : %s\n", vt.name); printf("\tCapabilities : %s\n", tcap2s(vt.capability).c_str()); - if (vt.capability & V4L2_TUNER_CAP_BANDS_MASK) { - printf("\tAvailable bands : %s\n", - tcap2bands(vt.capability).c_str()); - printf("\tCurrent band : %s\n", - band2s(vt.band)); - } if (vt.capability & V4L2_TUNER_CAP_LOW) printf("\tFrequency range : %.1f MHz - %.1f MHz\n", vt.rangelow / 16000.0, vt.rangehigh / 16000.0); @@ -4022,12 +3971,6 @@ int main(int argc, char **argv) printf("Modulator %d:\n", modulator.index); printf("\tName : %s\n", mt.name); printf("\tCapabilities : %s\n", tcap2s(mt.capability).c_str()); - if (mt.capability & V4L2_TUNER_CAP_BANDS_MASK) { - printf("\tAvailable bands : %s\n", - tcap2bands(mt.capability).c_str()); - printf("\tCurrent band : %s\n", - band2s(mt.band)); - } if (mt.capability & V4L2_TUNER_CAP_LOW) printf("\tFrequency range : %.1f MHz - %.1f MHz\n", mt.rangelow / 16000.0, mt.rangehigh / 16000.0); _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
