API tools faq
paste
Guest User

rockbox 15band patch

a guest
Mar 1st, 2011
260
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 26.07 KB | None | 0 0
raw download clone embed print report
  1. Index: apps/settings.c
  2. ===================================================================
  3. --- apps/settings.c (revision 29067)
  4. +++ apps/settings.c (working copy)
  5. @@ -971,7 +971,7 @@
  6.      /* Configure software equalizer, hardware eq is handled in audio_init() */
  7.      dsp_set_eq(global_settings.eq_enabled);
  8.      dsp_set_eq_precut(global_settings.eq_precut);
  9. -    for(i = 0; i < 5; i++) {
  10. +    for(i = 0; i < 15; i++) {
  11.          dsp_set_eq_coefs(i);
  12.      }
  13.  
  14. Index: apps/settings.h
  15. ===================================================================
  16. --- apps/settings.h (revision 29067)
  17. +++ apps/settings.h (working copy)
  18. @@ -360,6 +360,56 @@
  19.      int eq_band4_q;
  20.      int eq_band4_gain;          /* +/- dB */
  21.  
  22. +    /* Band 5 settings */
  23. +    int eq_band5_cutoff;        /* Hz */
  24. +    int eq_band5_q;
  25. +    int eq_band5_gain;          /* +/- dB */
  26. +
  27. +    /* Band 6 settings */
  28. +    int eq_band6_cutoff;        /* Hz */
  29. +    int eq_band6_q;
  30. +    int eq_band6_gain;          /* +/- dB */
  31. +
  32. +    /* Band 7 settings */
  33. +    int eq_band7_cutoff;        /* Hz */
  34. +    int eq_band7_q;
  35. +    int eq_band7_gain;          /* +/- dB */
  36. +
  37. +    /* Band 8 settings */
  38. +    int eq_band8_cutoff;        /* Hz */
  39. +    int eq_band8_q;
  40. +    int eq_band8_gain;          /* +/- dB */
  41. +
  42. +    /* Band 9 settings */
  43. +    int eq_band9_cutoff;        /* Hz */
  44. +    int eq_band9_q;
  45. +    int eq_band9_gain;          /* +/- dB */
  46. +
  47. +    /* Band 10 settings */
  48. +    int eq_band10_cutoff;        /* Hz */
  49. +    int eq_band10_q;
  50. +    int eq_band10_gain;          /* +/- dB */
  51. +
  52. +    /* Band 11 settings */
  53. +    int eq_band11_cutoff;        /* Hz */
  54. +    int eq_band11_q;
  55. +    int eq_band11_gain;          /* +/- dB */
  56. +
  57. +    /* Band 12 settings */
  58. +    int eq_band12_cutoff;        /* Hz */
  59. +    int eq_band12_q;
  60. +    int eq_band12_gain;          /* +/- dB */
  61. +
  62. +    /* Band 13 settings */
  63. +    int eq_band13_cutoff;        /* Hz */
  64. +    int eq_band13_q;
  65. +    int eq_band13_gain;          /* +/- dB */
  66. +
  67. +    /* Band 14 settings */
  68. +    int eq_band14_cutoff;        /* Hz */
  69. +    int eq_band14_q;
  70. +    int eq_band14_gain;          /* +/- dB */
  71. +
  72.      /* Misc. swcodec */
  73.      int  beep;              /* system beep volume when changing tracks etc. */
  74.      int  keyclick;          /* keyclick volume */
  75. Index: apps/menus/eq_menu.c
  76. ===================================================================
  77. --- apps/menus/eq_menu.c    (revision 29067)
  78. +++ apps/menus/eq_menu.c    (working copy)
  79. @@ -74,7 +74,7 @@
  80.      dsp_set_eq(global_settings.eq_enabled);
  81.      dsp_set_eq_precut(global_settings.eq_precut);    
  82.      /* Update all bands */
  83. -    for(i = 0; i < 5; i++) {
  84. +    for(i = 0; i < 15; i++) {
  85.          dsp_set_eq_coefs(i);
  86.      }
  87.  }
  88. @@ -102,18 +102,48 @@
  89.  MENUITEM_SETTING(cutoff_2, &global_settings.eq_band2_cutoff, eq_setting_callback);
  90.  MENUITEM_SETTING(cutoff_3, &global_settings.eq_band3_cutoff, eq_setting_callback);
  91.  MENUITEM_SETTING(cutoff_4, &global_settings.eq_band4_cutoff, eq_setting_callback);
  92. +MENUITEM_SETTING(cutoff_5, &global_settings.eq_band5_cutoff, eq_setting_callback);
  93. +MENUITEM_SETTING(cutoff_6, &global_settings.eq_band6_cutoff, eq_setting_callback);
  94. +MENUITEM_SETTING(cutoff_7, &global_settings.eq_band7_cutoff, eq_setting_callback);
  95. +MENUITEM_SETTING(cutoff_8, &global_settings.eq_band8_cutoff, eq_setting_callback);
  96. +MENUITEM_SETTING(cutoff_9, &global_settings.eq_band9_cutoff, eq_setting_callback);
  97. +MENUITEM_SETTING(cutoff_10, &global_settings.eq_band10_cutoff, eq_setting_callback);
  98. +MENUITEM_SETTING(cutoff_11, &global_settings.eq_band11_cutoff, eq_setting_callback);
  99. +MENUITEM_SETTING(cutoff_12, &global_settings.eq_band12_cutoff, eq_setting_callback);
  100. +MENUITEM_SETTING(cutoff_13, &global_settings.eq_band13_cutoff, eq_setting_callback);
  101. +MENUITEM_SETTING(cutoff_14, &global_settings.eq_band14_cutoff, eq_setting_callback);
  102.  
  103.  MENUITEM_SETTING(q_0, &global_settings.eq_band0_q, eq_setting_callback);
  104.  MENUITEM_SETTING(q_1, &global_settings.eq_band1_q, eq_setting_callback);
  105.  MENUITEM_SETTING(q_2, &global_settings.eq_band2_q, eq_setting_callback);
  106.  MENUITEM_SETTING(q_3, &global_settings.eq_band3_q, eq_setting_callback);
  107.  MENUITEM_SETTING(q_4, &global_settings.eq_band4_q, eq_setting_callback);
  108. +MENUITEM_SETTING(q_5, &global_settings.eq_band5_q, eq_setting_callback);
  109. +MENUITEM_SETTING(q_6, &global_settings.eq_band6_q, eq_setting_callback);
  110. +MENUITEM_SETTING(q_7, &global_settings.eq_band7_q, eq_setting_callback);
  111. +MENUITEM_SETTING(q_8, &global_settings.eq_band8_q, eq_setting_callback);
  112. +MENUITEM_SETTING(q_9, &global_settings.eq_band9_q, eq_setting_callback);
  113. +MENUITEM_SETTING(q_10, &global_settings.eq_band10_q, eq_setting_callback);
  114. +MENUITEM_SETTING(q_11, &global_settings.eq_band11_q, eq_setting_callback);
  115. +MENUITEM_SETTING(q_12, &global_settings.eq_band12_q, eq_setting_callback);
  116. +MENUITEM_SETTING(q_13, &global_settings.eq_band13_q, eq_setting_callback);
  117. +MENUITEM_SETTING(q_14, &global_settings.eq_band14_q, eq_setting_callback);
  118.  
  119.  MENUITEM_SETTING(gain_0, &global_settings.eq_band0_gain, eq_setting_callback);
  120.  MENUITEM_SETTING(gain_1, &global_settings.eq_band1_gain, eq_setting_callback);
  121.  MENUITEM_SETTING(gain_2, &global_settings.eq_band2_gain, eq_setting_callback);
  122.  MENUITEM_SETTING(gain_3, &global_settings.eq_band3_gain, eq_setting_callback);
  123.  MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, eq_setting_callback);
  124. +MENUITEM_SETTING(gain_5, &global_settings.eq_band5_gain, eq_setting_callback);
  125. +MENUITEM_SETTING(gain_6, &global_settings.eq_band6_gain, eq_setting_callback);
  126. +MENUITEM_SETTING(gain_7, &global_settings.eq_band7_gain, eq_setting_callback);
  127. +MENUITEM_SETTING(gain_8, &global_settings.eq_band8_gain, eq_setting_callback);
  128. +MENUITEM_SETTING(gain_9, &global_settings.eq_band9_gain, eq_setting_callback);
  129. +MENUITEM_SETTING(gain_10, &global_settings.eq_band10_gain, eq_setting_callback);
  130. +MENUITEM_SETTING(gain_11, &global_settings.eq_band11_gain, eq_setting_callback);
  131. +MENUITEM_SETTING(gain_12, &global_settings.eq_band12_gain, eq_setting_callback);
  132. +MENUITEM_SETTING(gain_13, &global_settings.eq_band13_gain, eq_setting_callback);
  133. +MENUITEM_SETTING(gain_14, &global_settings.eq_band14_gain, eq_setting_callback);
  134.  
  135.  static char* gainitem_get_name(int selected_item, void * data, char *buffer)
  136.  {
  137. @@ -162,14 +192,66 @@
  138.                            do_option, (void*)&gain_4,
  139.                            gainitem_get_name, gainitem_speak_item,
  140.                            &global_settings.eq_band4_cutoff, NULL, Icon_NOICON);
  141. -                                    
  142. +MENUITEM_FUNCTION_DYNTEXT(gain_item_5, MENU_FUNC_USEPARAM,
  143. +                          do_option, (void*)&gain_5,
  144. +                          gainitem_get_name, gainitem_speak_item,
  145. +                          &global_settings.eq_band5_cutoff, NULL, Icon_NOICON);
  146. +MENUITEM_FUNCTION_DYNTEXT(gain_item_6, MENU_FUNC_USEPARAM,
  147. +                          do_option, (void*)&gain_6,
  148. +                          gainitem_get_name, gainitem_speak_item,
  149. +                          &global_settings.eq_band6_cutoff, NULL, Icon_NOICON);
  150. +MENUITEM_FUNCTION_DYNTEXT(gain_item_7, MENU_FUNC_USEPARAM,
  151. +                          do_option, (void*)&gain_7,
  152. +                          gainitem_get_name, gainitem_speak_item,
  153. +                          &global_settings.eq_band7_cutoff, NULL, Icon_NOICON);
  154. +MENUITEM_FUNCTION_DYNTEXT(gain_item_8, MENU_FUNC_USEPARAM,
  155. +                          do_option, (void*)&gain_8,
  156. +                          gainitem_get_name, gainitem_speak_item,
  157. +                          &global_settings.eq_band8_cutoff, NULL, Icon_NOICON);
  158. +MENUITEM_FUNCTION_DYNTEXT(gain_item_9, MENU_FUNC_USEPARAM,
  159. +                          do_option, (void*)&gain_9,
  160. +                          gainitem_get_name, gainitem_speak_item,
  161. +                          &global_settings.eq_band9_cutoff, NULL, Icon_NOICON);
  162. +MENUITEM_FUNCTION_DYNTEXT(gain_item_10, MENU_FUNC_USEPARAM,
  163. +                          do_option, (void*)&gain_10,
  164. +                          gainitem_get_name, gainitem_speak_item,
  165. +                          &global_settings.eq_band10_cutoff, NULL, Icon_NOICON);
  166. +MENUITEM_FUNCTION_DYNTEXT(gain_item_11, MENU_FUNC_USEPARAM,
  167. +                          do_option, (void*)&gain_11,
  168. +                          gainitem_get_name, gainitem_speak_item,
  169. +                          &global_settings.eq_band11_cutoff, NULL, Icon_NOICON);
  170. +MENUITEM_FUNCTION_DYNTEXT(gain_item_12, MENU_FUNC_USEPARAM,
  171. +                          do_option, (void*)&gain_12,
  172. +                          gainitem_get_name, gainitem_speak_item,
  173. +                          &global_settings.eq_band12_cutoff, NULL, Icon_NOICON);
  174. +MENUITEM_FUNCTION_DYNTEXT(gain_item_13, MENU_FUNC_USEPARAM,
  175. +                          do_option, (void*)&gain_13,
  176. +                          gainitem_get_name, gainitem_speak_item,
  177. +                          &global_settings.eq_band13_cutoff, NULL, Icon_NOICON);
  178. +MENUITEM_FUNCTION_DYNTEXT(gain_item_14, MENU_FUNC_USEPARAM,
  179. +                          do_option, (void*)&gain_14,
  180. +                          gainitem_get_name, gainitem_speak_item,
  181. +                          &global_settings.eq_band14_cutoff, NULL, Icon_NOICON);
  182.  MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, Icon_NOICON, &gain_item_0,
  183. -            &gain_item_1, &gain_item_2, &gain_item_3, &gain_item_4);
  184. +            &gain_item_1, &gain_item_2, &gain_item_3, &gain_item_4,
  185. +            &gain_item_5, &gain_item_6, &gain_item_7, &gain_item_8,
  186. +            &gain_item_9, &gain_item_10, &gain_item_11, &gain_item_12,
  187. +            &gain_item_13, &gain_item_14);
  188.  
  189. -static const struct menu_item_ex *band_items[3][3] = {
  190. +static const struct menu_item_ex *band_items[13][3] = {
  191.      { &cutoff_1, &q_1, &gain_1 },
  192.      { &cutoff_2, &q_2, &gain_2 },
  193. -    { &cutoff_3, &q_3, &gain_3 }
  194. +    { &cutoff_3, &q_3, &gain_3 },
  195. +    { &cutoff_4, &q_4, &gain_4 },
  196. +    { &cutoff_5, &q_5, &gain_5 },
  197. +    { &cutoff_6, &q_6, &gain_6 },
  198. +    { &cutoff_7, &q_7, &gain_7 },
  199. +    { &cutoff_8, &q_8, &gain_8 },
  200. +    { &cutoff_9, &q_9, &gain_9 },
  201. +    { &cutoff_10, &q_10, &gain_10 },
  202. +    { &cutoff_11, &q_11, &gain_11 },
  203. +    { &cutoff_12, &q_12, &gain_12 },
  204. +    { &cutoff_13, &q_13, &gain_13 }
  205.  };
  206.  
  207.  static char* centerband_get_name(int selected_item, void * data, char *buffer)
  208. @@ -221,11 +303,54 @@
  209.                            do_center_band_menu, (void*)3,
  210.                            centerband_get_name, centerband_speak_item,
  211.                            (void*)3, NULL, Icon_EQ);
  212. -MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL,
  213. -            Icon_EQ, &cutoff_4, &q_4, &gain_4);
  214. +MENUITEM_FUNCTION_DYNTEXT(band_4_menu, MENU_FUNC_USEPARAM,
  215. +                          do_center_band_menu, (void*)4,
  216. +                          centerband_get_name, centerband_speak_item,
  217. +                          (void*)4, NULL, Icon_EQ);
  218. +MENUITEM_FUNCTION_DYNTEXT(band_5_menu, MENU_FUNC_USEPARAM,
  219. +                          do_center_band_menu, (void*)5,
  220. +                          centerband_get_name, centerband_speak_item,
  221. +                          (void*)5, NULL, Icon_EQ);
  222. +MENUITEM_FUNCTION_DYNTEXT(band_6_menu, MENU_FUNC_USEPARAM,
  223. +                          do_center_band_menu, (void*)6,
  224. +                          centerband_get_name, centerband_speak_item,
  225. +                          (void*)6, NULL, Icon_EQ);
  226. +MENUITEM_FUNCTION_DYNTEXT(band_7_menu, MENU_FUNC_USEPARAM,
  227. +                          do_center_band_menu, (void*)7,
  228. +                          centerband_get_name, centerband_speak_item,
  229. +                          (void*)7, NULL, Icon_EQ);
  230. +MENUITEM_FUNCTION_DYNTEXT(band_8_menu, MENU_FUNC_USEPARAM,
  231. +                          do_center_band_menu, (void*)8,
  232. +                          centerband_get_name, centerband_speak_item,
  233. +                          (void*)8, NULL, Icon_EQ);
  234. +MENUITEM_FUNCTION_DYNTEXT(band_9_menu, MENU_FUNC_USEPARAM,
  235. +                          do_center_band_menu, (void*)9,
  236. +                          centerband_get_name, centerband_speak_item,
  237. +                          (void*)9, NULL, Icon_EQ);
  238. +MENUITEM_FUNCTION_DYNTEXT(band_10_menu, MENU_FUNC_USEPARAM,
  239. +                          do_center_band_menu, (void*)10,
  240. +                          centerband_get_name, centerband_speak_item,
  241. +                          (void*)10, NULL, Icon_EQ);
  242. +MENUITEM_FUNCTION_DYNTEXT(band_11_menu, MENU_FUNC_USEPARAM,
  243. +                          do_center_band_menu, (void*)11,
  244. +                          centerband_get_name, centerband_speak_item,
  245. +                          (void*)11, NULL, Icon_EQ);
  246. +MENUITEM_FUNCTION_DYNTEXT(band_12_menu, MENU_FUNC_USEPARAM,
  247. +                          do_center_band_menu, (void*)12,
  248. +                          centerband_get_name, centerband_speak_item,
  249. +                          (void*)12, NULL, Icon_EQ);
  250. +MENUITEM_FUNCTION_DYNTEXT(band_13_menu, MENU_FUNC_USEPARAM,
  251. +                          do_center_band_menu, (void*)13,
  252. +                          centerband_get_name, centerband_speak_item,
  253. +                          (void*)13, NULL, Icon_EQ);
  254. +MAKE_MENU(band_14_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL,
  255. +            Icon_EQ, &cutoff_14, &q_14, &gain_14);
  256.  
  257.  MAKE_MENU(advanced_eq_menu_, ID2P(LANG_EQUALIZER_ADVANCED), NULL, Icon_EQ,
  258. -            &band_0_menu, &band_1_menu, &band_2_menu, &band_3_menu, &band_4_menu);
  259. +            &band_0_menu, &band_1_menu, &band_2_menu, &band_3_menu,
  260. +            &band_4_menu, &band_5_menu, &band_6_menu, &band_7_menu,
  261. +            &band_8_menu, &band_9_menu, &band_10_menu, &band_11_menu,
  262. +            &band_12_menu, &band_13_menu, &band_14_menu);
  263.  
  264.  
  265.  enum eq_slider_mode {
  266. @@ -281,7 +406,7 @@
  267.      if (band == 0) {
  268.          screen->putsxy(x1, y1, "LS: ");
  269.          screen->getstringsize("LS:", &w, &h);
  270. -    } else if (band == 4) {
  271. +    } else if (band == 14) {
  272.          screen->putsxy(x1, y1, "HS: ");
  273.          screen->getstringsize("HS:", &w, &h);
  274.      } else {
  275. @@ -353,8 +478,8 @@
  276.      int height = y;
  277.      int *setting = &global_settings.eq_band0_cutoff;
  278.  
  279. -    start_item = MIN(start_item, 5-nb_eq_sliders);
  280. -    for (i=0; i<5; i++) {
  281. +    start_item = MIN(start_item, 15-nb_eq_sliders);
  282. +    for (i=0; i<15; i++) {
  283.          cutoff = *setting++;
  284.          q = *setting++;
  285.          gain = *setting++;
  286. @@ -370,9 +495,9 @@
  287.              height++;
  288.          }
  289.      }
  290. -    if (nb_eq_sliders != 5)
  291. +    if (nb_eq_sliders != 15)
  292.          gui_scrollbar_draw(screen, 0, y, SCROLLBAR_SIZE - 1,
  293. -                           screen->lcdheight - y, 5,
  294. +                           screen->lcdheight - y, 15,
  295.                             start_item, start_item + nb_eq_sliders,
  296.                             VERTICAL);
  297.      return;
  298. @@ -411,8 +536,8 @@
  299.          if (height > screens[i].lcdheight)
  300.              nb_eq_sliders[i]--;
  301.  
  302. -        if (nb_eq_sliders[i] > 5)
  303. -            nb_eq_sliders[i] = 5;
  304. +        if (nb_eq_sliders[i] > 15)
  305. +            nb_eq_sliders[i] = 15;
  306.      }
  307.  
  308.      y = h + 1;
  309. @@ -472,12 +597,12 @@
  310.              }
  311.  
  312.              /* Draw scrollbar if needed */
  313. -            if (nb_eq_sliders[i] != 5)
  314. +            if (nb_eq_sliders[i] != 15)
  315.              {
  316.                  if (current_band == 0) {
  317.                      start_item = 0;
  318. -                } else if (current_band == 4) {
  319. -                    start_item = 5 - nb_eq_sliders[i];
  320. +                } else if (current_band == 14) {
  321. +                    start_item = 15 - nb_eq_sliders[i];
  322.                  } else {
  323.                      start_item = current_band - 1;
  324.                  }
  325. @@ -530,13 +655,13 @@
  326.          case ACTION_STD_PREVREPEAT:
  327.              current_band--;
  328.              if (current_band < 0)
  329. -                current_band = 4; /* wrap around */
  330. +                current_band = 14; /* wrap around */
  331.              break;
  332.  
  333.          case ACTION_STD_NEXT:
  334.          case ACTION_STD_NEXTREPEAT:
  335.              current_band++;
  336. -            if (current_band > 4)
  337. +            if (current_band > 14)
  338.                  current_band = 0; /* wrap around */
  339.              break;
  340.  
  341. Index: apps/dsp.c
  342. ===================================================================
  343. --- apps/dsp.c  (revision 29067)
  344. +++ apps/dsp.c  (working copy)
  345. @@ -129,8 +129,8 @@
  346.   */
  347.  struct eq_state
  348.  {
  349. -    char enabled[5];            /* 00h - Flags for active filters */
  350. -    struct eqfilter filters[5]; /* 08h - packing is 4? */
  351. +    char enabled[15];            /* 00h - Flags for active filters */
  352. +    struct eqfilter filters[15]; /* 08h - packing is 4? */
  353.                                  /* 10ch */
  354.  };
  355.  
  356. @@ -977,7 +977,7 @@
  357.      {
  358.          if (band == 0)
  359.              eq_ls_coefs(cutoff, q, gain, eq_data.filters[band].coefs);
  360. -        else if (band == 4)
  361. +        else if (band == 14)
  362.              eq_hs_coefs(cutoff, q, gain, eq_data.filters[band].coefs);
  363.          else
  364.              eq_pk_coefs(cutoff, q, gain, eq_data.filters[band].coefs);
  365. @@ -995,6 +995,16 @@
  366.          EQ_PEAK_SHIFT,   /* peaking    */
  367.          EQ_PEAK_SHIFT,   /* peaking    */
  368.          EQ_PEAK_SHIFT,   /* peaking    */
  369. +        EQ_PEAK_SHIFT,   /* peaking    */
  370. +        EQ_PEAK_SHIFT,   /* peaking    */
  371. +        EQ_PEAK_SHIFT,   /* peaking    */
  372. +        EQ_PEAK_SHIFT,   /* peaking    */
  373. +        EQ_PEAK_SHIFT,   /* peaking    */
  374. +        EQ_PEAK_SHIFT,   /* peaking    */
  375. +        EQ_PEAK_SHIFT,   /* peaking    */
  376. +        EQ_PEAK_SHIFT,   /* peaking    */
  377. +        EQ_PEAK_SHIFT,   /* peaking    */
  378. +        EQ_PEAK_SHIFT,   /* peaking    */
  379.          EQ_SHELF_SHIFT,  /* high shelf */
  380.      };
  381.      unsigned int channels = AUDIO_DSP.data.num_channels;
  382. @@ -1004,7 +1014,7 @@
  383.         filters and 1 high shelf filter, in that order. we need to know this
  384.         so we can choose the correct shift factor.
  385.       */
  386. -    for (i = 0; i < 5; i++)
  387. +    for (i = 0; i < 15; i++)
  388.      {
  389.          if (!eq_data.enabled[i])
  390.              continue;
  391. Index: apps/settings_list.c
  392. ===================================================================
  393. --- apps/settings_list.c    (revision 29067)
  394. +++ apps/settings_list.c    (working copy)
  395. @@ -1353,6 +1353,36 @@
  396.      INT_SETTING_NOWRAP(F_EQSETTING, eq_band4_cutoff, LANG_EQUALIZER_BAND_CUTOFF,
  397.                         12000, "eq band 4 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
  398.                         EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
  399. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band5_cutoff, LANG_EQUALIZER_BAND_CUTOFF,
  400. +                       12000, "eq band 5 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
  401. +                       EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
  402. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band6_cutoff, LANG_EQUALIZER_BAND_CUTOFF,
  403. +                       12000, "eq band 6 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
  404. +                       EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
  405. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band7_cutoff, LANG_EQUALIZER_BAND_CUTOFF,
  406. +                       12000, "eq band 7 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
  407. +                       EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
  408. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band8_cutoff, LANG_EQUALIZER_BAND_CUTOFF,
  409. +                       12000, "eq band 8 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
  410. +                       EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
  411. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band9_cutoff, LANG_EQUALIZER_BAND_CUTOFF,
  412. +                       12000, "eq band 9 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
  413. +                       EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
  414. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band10_cutoff, LANG_EQUALIZER_BAND_CUTOFF,
  415. +                       12000, "eq band 10 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
  416. +                       EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
  417. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band11_cutoff, LANG_EQUALIZER_BAND_CUTOFF,
  418. +                       12000, "eq band 11 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
  419. +                       EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
  420. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band12_cutoff, LANG_EQUALIZER_BAND_CUTOFF,
  421. +                       12000, "eq band 12 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
  422. +                       EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
  423. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band13_cutoff, LANG_EQUALIZER_BAND_CUTOFF,
  424. +                       12000, "eq band 13 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
  425. +                       EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
  426. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band14_cutoff, LANG_EQUALIZER_BAND_CUTOFF,
  427. +                       12000, "eq band 14 cutoff", UNIT_HERTZ, EQ_CUTOFF_MIN,
  428. +                       EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, NULL, NULL, NULL),
  429.      /* 0..64 (or 0.0 to 6.4) */
  430.      INT_SETTING_NOWRAP(F_EQSETTING, eq_band0_q, LANG_EQUALIZER_BAND_Q, 7,
  431.                         "eq band 0 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  432. @@ -1366,9 +1396,39 @@
  433.      INT_SETTING_NOWRAP(F_EQSETTING, eq_band3_q, LANG_EQUALIZER_BAND_Q, 10,
  434.                         "eq band 3 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  435.                         eq_q_format, get_dec_talkid, NULL),
  436. -    INT_SETTING_NOWRAP(F_EQSETTING, eq_band4_q, LANG_EQUALIZER_BAND_Q, 7,
  437. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band4_q, LANG_EQUALIZER_BAND_Q, 10,
  438.                         "eq band 4 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  439.                         eq_q_format, get_dec_talkid, NULL),
  440. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band5_q, LANG_EQUALIZER_BAND_Q, 10,
  441. +                       "eq band 5 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  442. +                       eq_q_format, get_dec_talkid, NULL),
  443. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band6_q, LANG_EQUALIZER_BAND_Q, 10,
  444. +                       "eq band 6 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  445. +                       eq_q_format, get_dec_talkid, NULL),
  446. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band7_q, LANG_EQUALIZER_BAND_Q, 10,
  447. +                       "eq band 7 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  448. +                       eq_q_format, get_dec_talkid, NULL),
  449. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band8_q, LANG_EQUALIZER_BAND_Q, 10,
  450. +                       "eq band 8 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  451. +                       eq_q_format, get_dec_talkid, NULL),
  452. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band9_q, LANG_EQUALIZER_BAND_Q, 10,
  453. +                       "eq band 9 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  454. +                       eq_q_format, get_dec_talkid, NULL),
  455. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band10_q, LANG_EQUALIZER_BAND_Q, 10,
  456. +                       "eq band 10 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  457. +                       eq_q_format, get_dec_talkid, NULL),
  458. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band11_q, LANG_EQUALIZER_BAND_Q, 10,
  459. +                       "eq band 11 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  460. +                       eq_q_format, get_dec_talkid, NULL),
  461. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band12_q, LANG_EQUALIZER_BAND_Q, 10,
  462. +                       "eq band 12 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  463. +                       eq_q_format, get_dec_talkid, NULL),
  464. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band13_q, LANG_EQUALIZER_BAND_Q, 10,
  465. +                       "eq band 13 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  466. +                       eq_q_format, get_dec_talkid, NULL),
  467. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band14_q, LANG_EQUALIZER_BAND_Q, 7,
  468. +                       "eq band 14 q", UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
  469. +                       eq_q_format, get_dec_talkid, NULL),
  470.      /* -240..240 (or -24db to +24db) */
  471.      INT_SETTING_NOWRAP(F_EQSETTING, eq_band0_gain, LANG_GAIN, 0,
  472.                         "eq band 0 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  473. @@ -1385,7 +1445,36 @@
  474.      INT_SETTING_NOWRAP(F_EQSETTING, eq_band4_gain, LANG_GAIN, 0,
  475.                         "eq band 4 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  476.                         EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
  477. -
  478. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band5_gain, LANG_GAIN, 0,
  479. +                       "eq band 5 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  480. +                       EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
  481. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band6_gain, LANG_GAIN, 0,
  482. +                       "eq band 6 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  483. +                       EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
  484. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band7_gain, LANG_GAIN, 0,
  485. +                       "eq band 7 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  486. +                       EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
  487. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band8_gain, LANG_GAIN, 0,
  488. +                       "eq band 8 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  489. +                       EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
  490. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band9_gain, LANG_GAIN, 0,
  491. +                       "eq band 9 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  492. +                       EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
  493. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band10_gain, LANG_GAIN, 0,
  494. +                       "eq band 10 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  495. +                       EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
  496. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band11_gain, LANG_GAIN, 0,
  497. +                       "eq band 11 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  498. +                       EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
  499. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band12_gain, LANG_GAIN, 0,
  500. +                       "eq band 12 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  501. +                       EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
  502. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band13_gain, LANG_GAIN, 0,
  503. +                       "eq band 13 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  504. +                       EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
  505. +    INT_SETTING_NOWRAP(F_EQSETTING, eq_band14_gain, LANG_GAIN, 0,
  506. +                       "eq band 14 gain", UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX,
  507. +                       EQ_GAIN_STEP, db_format, get_dec_talkid, NULL),
  508.      /* dithering */
  509.      OFFON_SETTING(F_SOUNDSETTING, dithering_enabled, LANG_DITHERING, false,
  510.                    "dithering enabled", dsp_dither_enable),
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!