summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Gmeiner <christian.gmeiner@gmail.com>2008-02-09 14:43:36 +0000
committerChristian Gmeiner <christian.gmeiner@gmail.com>2008-02-09 14:43:36 +0000
commitc6e9b8b7e15bb6eb0a4c0e6614a91c04427c9d3d (patch)
treeb20a90479f1ec59f7085bfce6c74487bb6e4531a
parenta8050e9fd10bfe198bbe51c4434101aed709a402 (diff)
downloadrockbox-c6e9b8b7e15bb6eb0a4c0e6614a91c04427c9d3d.tar.gz
rockbox-c6e9b8b7e15bb6eb0a4c0e6614a91c04427c9d3d.zip
move audiohw_enable_output to audiohw.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16251 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/as3514.h1
-rw-r--r--firmware/export/audiohw.h6
-rw-r--r--firmware/export/tlv320.h1
-rw-r--r--firmware/export/uda1380.h1
-rw-r--r--firmware/export/wm8721.h1
-rw-r--r--firmware/export/wm8751.h1
-rw-r--r--firmware/export/wm8758.h1
-rw-r--r--firmware/export/wm8975.h1
-rw-r--r--firmware/export/wm8985.h1
9 files changed, 6 insertions, 8 deletions
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h
index 088d55141a..8bcc1f2bc1 100644
--- a/firmware/export/as3514.h
+++ b/firmware/export/as3514.h
@@ -24,7 +24,6 @@
24 24
25extern int tenthdb2master(int db); 25extern int tenthdb2master(int db);
26 26
27extern void audiohw_enable_output(bool enable);
28extern int audiohw_set_master_vol(int vol_l, int vol_r); 27extern int audiohw_set_master_vol(int vol_l, int vol_r);
29extern int audiohw_set_lineout_vol(int vol_l, int vol_r); 28extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
30extern void audiohw_set_sample_rate(int sampling_control); 29extern void audiohw_set_sample_rate(int sampling_control);
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h
index cdc92221d7..224cf20d18 100644
--- a/firmware/export/audiohw.h
+++ b/firmware/export/audiohw.h
@@ -119,6 +119,12 @@ void audiohw_close(void);
119 */ 119 */
120void audiohw_mute(bool mute); 120void audiohw_mute(bool mute);
121 121
122/**
123 * Silently en/disable audio output.
124 * @param enable true or false.
125 */
126void audiohw_enable_output(bool enable);
127
122#ifdef HAVE_RECORDING 128#ifdef HAVE_RECORDING
123 129
124/** 130/**
diff --git a/firmware/export/tlv320.h b/firmware/export/tlv320.h
index 87b29dd422..6d9f858321 100644
--- a/firmware/export/tlv320.h
+++ b/firmware/export/tlv320.h
@@ -37,7 +37,6 @@ extern int tenthdb2master(int db);
37 * 88200: 2 = MCLK*2 MCLK SCLK, LRCK: Audio Clk / 2 37 * 88200: 2 = MCLK*2 MCLK SCLK, LRCK: Audio Clk / 2
38 */ 38 */
39extern void audiohw_set_frequency(unsigned fsel); 39extern void audiohw_set_frequency(unsigned fsel);
40extern void audiohw_enable_output(bool enable);
41extern void audiohw_set_headphone_vol(int vol_l, int vol_r); 40extern void audiohw_set_headphone_vol(int vol_l, int vol_r);
42 41
43#define HEADPHONE_MUTE 0x30 /* 0110000 = -73db */ 42#define HEADPHONE_MUTE 0x30 /* 0110000 = -73db */
diff --git a/firmware/export/uda1380.h b/firmware/export/uda1380.h
index 28da424660..db93e75371 100644
--- a/firmware/export/uda1380.h
+++ b/firmware/export/uda1380.h
@@ -27,7 +27,6 @@
27extern int tenthdb2master(int db); 27extern int tenthdb2master(int db);
28extern int tenthdb2mixer(int db); 28extern int tenthdb2mixer(int db);
29 29
30extern void audiohw_enable_output(bool enable);
31extern int audiohw_set_master_vol(int vol_l, int vol_r); 30extern int audiohw_set_master_vol(int vol_l, int vol_r);
32extern int audiohw_set_mixer_vol(int channel1, int channel2); 31extern int audiohw_set_mixer_vol(int channel1, int channel2);
33extern void audiohw_set_bass(int value); 32extern void audiohw_set_bass(int value);
diff --git a/firmware/export/wm8721.h b/firmware/export/wm8721.h
index 25338af737..a1909fdecb 100644
--- a/firmware/export/wm8721.h
+++ b/firmware/export/wm8721.h
@@ -27,7 +27,6 @@
27extern int tenthdb2master(int db); 27extern int tenthdb2master(int db);
28extern int tenthdb2mixer(int db); 28extern int tenthdb2mixer(int db);
29 29
30extern void audiohw_enable_output(bool enable);
31extern int audiohw_set_master_vol(int vol_l, int vol_r); 30extern int audiohw_set_master_vol(int vol_l, int vol_r);
32extern void audiohw_set_nsorder(int order); 31extern void audiohw_set_nsorder(int order);
33extern void audiohw_set_sample_rate(int sampling_control); 32extern void audiohw_set_sample_rate(int sampling_control);
diff --git a/firmware/export/wm8751.h b/firmware/export/wm8751.h
index 40d581c081..f74adb5944 100644
--- a/firmware/export/wm8751.h
+++ b/firmware/export/wm8751.h
@@ -26,7 +26,6 @@
26extern int tenthdb2master(int db); 26extern int tenthdb2master(int db);
27 27
28extern void audiohw_preinit(void); 28extern void audiohw_preinit(void);
29extern void audiohw_enable_output(bool enable);
30extern int audiohw_set_master_vol(int vol_l, int vol_r); 29extern int audiohw_set_master_vol(int vol_l, int vol_r);
31extern int audiohw_set_lineout_vol(int vol_l, int vol_r); 30extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
32extern void audiohw_set_bass(int value); 31extern void audiohw_set_bass(int value);
diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h
index df60851550..b8904c1657 100644
--- a/firmware/export/wm8758.h
+++ b/firmware/export/wm8758.h
@@ -27,7 +27,6 @@
27extern int tenthdb2master(int db); 27extern int tenthdb2master(int db);
28extern int tenthdb2mixer(int db); 28extern int tenthdb2mixer(int db);
29 29
30extern void audiohw_enable_output(bool enable);
31extern int audiohw_set_master_vol(int vol_l, int vol_r); 30extern int audiohw_set_master_vol(int vol_l, int vol_r);
32extern int audiohw_set_lineout_vol(int vol_l, int vol_r); 31extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
33extern int audiohw_set_mixer_vol(int channel1, int channel2); 32extern int audiohw_set_mixer_vol(int channel1, int channel2);
diff --git a/firmware/export/wm8975.h b/firmware/export/wm8975.h
index 2121561af6..07a62d1ce7 100644
--- a/firmware/export/wm8975.h
+++ b/firmware/export/wm8975.h
@@ -26,7 +26,6 @@
26 26
27extern int tenthdb2master(int db); 27extern int tenthdb2master(int db);
28 28
29extern void audiohw_enable_output(bool enable);
30extern int audiohw_set_master_vol(int vol_l, int vol_r); 29extern int audiohw_set_master_vol(int vol_l, int vol_r);
31extern int audiohw_set_lineout_vol(int vol_l, int vol_r); 30extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
32extern void audiohw_set_bass(int value); 31extern void audiohw_set_bass(int value);
diff --git a/firmware/export/wm8985.h b/firmware/export/wm8985.h
index 9ae5515fa7..994d9ba366 100644
--- a/firmware/export/wm8985.h
+++ b/firmware/export/wm8985.h
@@ -26,7 +26,6 @@
26 26
27extern int tenthdb2master(int db); 27extern int tenthdb2master(int db);
28 28
29extern void audiohw_enable_output(bool enable);
30extern int audiohw_set_master_vol(int vol_l, int vol_r); 29extern int audiohw_set_master_vol(int vol_l, int vol_r);
31extern int audiohw_set_lineout_vol(int vol_l, int vol_r); 30extern int audiohw_set_lineout_vol(int vol_l, int vol_r);
32extern void audiohw_set_bass(int value); 31extern void audiohw_set_bass(int value);