Make it easier to disable tts

This is a small step in mitigating #1125
emilk · Jul 25, 2022 · c02fbfe · c02fbfe
1 parent 0913c77
commit c02fbfe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/eframe/src/web/screen_reader.rs b/eframe/src/web/screen_reader.rs
@@ -1,17 +1,17 @@
 pub struct ScreenReader {
-    #[cfg(feature = "screen_reader")]
+    #[cfg(feature = "tts")]
     tts: Option<tts::Tts>,
 }
 
-#[cfg(not(feature = "screen_reader"))]
+#[cfg(not(feature = "tts"))]
 #[allow(clippy::derivable_impls)] // False positive
 impl Default for ScreenReader {
     fn default() -> Self {
         Self {}
     }
 }
 
-#[cfg(feature = "screen_reader")]
+#[cfg(feature = "tts")]
 impl Default for ScreenReader {
     fn default() -> Self {
         let tts = match tts::Tts::default() {
@@ -29,11 +29,11 @@ impl Default for ScreenReader {
 }
 
 impl ScreenReader {
-    #[cfg(not(feature = "screen_reader"))]
+    #[cfg(not(feature = "tts"))]
     #[allow(clippy::unused_self)]
     pub fn speak(&mut self, _text: &str) {}
 
-    #[cfg(feature = "screen_reader")]
+    #[cfg(feature = "tts")]
     pub fn speak(&mut self, text: &str) {
         if text.is_empty() {
             return;

diff --git a/egui-winit/src/screen_reader.rs b/egui-winit/src/screen_reader.rs
@@ -1,17 +1,17 @@
 pub struct ScreenReader {
-    #[cfg(feature = "screen_reader")]
+    #[cfg(feature = "tts")]
     tts: Option<tts::Tts>,
 }
 
-#[cfg(not(feature = "screen_reader"))]
+#[cfg(not(feature = "tts"))]
 #[allow(clippy::derivable_impls)] // False positive
 impl Default for ScreenReader {
     fn default() -> Self {
         Self {}
     }
 }
 
-#[cfg(feature = "screen_reader")]
+#[cfg(feature = "tts")]
 impl Default for ScreenReader {
     fn default() -> Self {
         let tts = match tts::Tts::default() {
@@ -29,11 +29,11 @@ impl Default for ScreenReader {
 }
 
 impl ScreenReader {
-    #[cfg(not(feature = "screen_reader"))]
+    #[cfg(not(feature = "tts"))]
     #[allow(clippy::unused_self)]
     pub fn speak(&mut self, _text: &str) {}
 
-    #[cfg(feature = "screen_reader")]
+    #[cfg(feature = "tts")]
     pub fn speak(&mut self, text: &str) {
         if text.is_empty() {
             return;