From 6fc9d80ab051af0cebc6ef565a5506ae08a96880 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Wed, 19 Jul 2017 02:51:42 +0200
Subject: [PATCH] Rename audio/alsa modules

---
 src/{alsa_card.rs => alsa_backend.rs} | 2 +-
 src/app_state.rs                      | 4 ++--
 src/{audio.rs => audio_frontend.rs}   | 0
 src/hotkeys.rs                        | 2 +-
 src/lib.rs                            | 4 ++--
 src/notif.rs                          | 2 +-
 src/support_audio.rs                  | 2 +-
 src/ui_entry.rs                       | 2 +-
 src/ui_popup_menu.rs                  | 2 +-
 src/ui_popup_window.rs                | 2 +-
 src/ui_prefs_dialog.rs                | 2 +-
 src/ui_tray_icon.rs                   | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)
 rename src/{alsa_card.rs => alsa_backend.rs} (99%)
 rename src/{audio.rs => audio_frontend.rs} (100%)

diff --git a/src/alsa_card.rs b/src/alsa_backend.rs
similarity index 99%
rename from src/alsa_card.rs
rename to src/alsa_backend.rs
index ee8f669f7..611663217 100644
--- a/src/alsa_card.rs
+++ b/src/alsa_backend.rs
@@ -12,7 +12,7 @@ use alsa::mixer::SelemChannelId::*;
 use alsa::mixer::{Mixer, Selem, SelemId};
 use alsa::poll::PollDescriptors;
 use alsa_sys;
-use audio::*;
+use audio_frontend::*;
 use errors::*;
 use glib;
 use glib_sys;
diff --git a/src/app_state.rs b/src/app_state.rs
index 80c87cb00..48a21d27a 100644
--- a/src/app_state.rs
+++ b/src/app_state.rs
@@ -1,8 +1,8 @@
 //! Global application state.
 
 
-use alsa_card::*;
-use audio::*;
+use alsa_backend::*;
+use audio_frontend::*;
 use errors::*;
 use gtk;
 use hotkeys::Hotkeys;
diff --git a/src/audio.rs b/src/audio_frontend.rs
similarity index 100%
rename from src/audio.rs
rename to src/audio_frontend.rs
diff --git a/src/hotkeys.rs b/src/hotkeys.rs
index d4cc4c610..887059749 100644
--- a/src/hotkeys.rs
+++ b/src/hotkeys.rs
@@ -5,7 +5,7 @@
 //! before they can be interpreted by Gtk/Gdk.
 
 
-use audio::*;
+use audio_frontend::*;
 use errors::*;
 use errors;
 use gdk;
diff --git a/src/lib.rs b/src/lib.rs
index f60dd4b42..16a2f2e22 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -76,9 +76,9 @@ pub mod errors;
 #[macro_use]
 pub mod glade_helpers;
 
-pub mod alsa_card;
+pub mod alsa_backend;
 pub mod app_state;
-pub mod audio;
+pub mod audio_frontend;
 pub mod gdk_x11;
 pub mod hotkey;
 pub mod hotkeys;
diff --git a/src/notif.rs b/src/notif.rs
index a7e40fc20..01a82b5e6 100644
--- a/src/notif.rs
+++ b/src/notif.rs
@@ -5,7 +5,7 @@
 
 
 use app_state::*;
-use audio::*;
+use audio_frontend::*;
 use errors::*;
 use glib::prelude::*;
 use libnotify;
diff --git a/src/support_audio.rs b/src/support_audio.rs
index 7082a3e1e..b094c7e39 100644
--- a/src/support_audio.rs
+++ b/src/support_audio.rs
@@ -6,7 +6,7 @@
 //! but are important helpers.
 
 
-use audio::*;
+use audio_frontend::*;
 use errors::*;
 use prefs::*;
 use support_alsa::*;
diff --git a/src/ui_entry.rs b/src/ui_entry.rs
index 972b089ab..94793a4eb 100644
--- a/src/ui_entry.rs
+++ b/src/ui_entry.rs
@@ -2,7 +2,7 @@
 
 
 use app_state::*;
-use audio::*;
+use audio_frontend::*;
 use gtk::DialogExt;
 use gtk::MessageDialogExt;
 use gtk::WidgetExt;
diff --git a/src/ui_popup_menu.rs b/src/ui_popup_menu.rs
index 0e7a7f281..d4f9803bd 100644
--- a/src/ui_popup_menu.rs
+++ b/src/ui_popup_menu.rs
@@ -12,7 +12,7 @@
 //! * Quit
 
 use app_state::*;
-use audio::*;
+use audio_frontend::*;
 use gtk::prelude::*;
 use gtk;
 use std::rc::Rc;
diff --git a/src/ui_popup_window.rs b/src/ui_popup_window.rs
index 1efe4609f..2d6dec58c 100644
--- a/src/ui_popup_window.rs
+++ b/src/ui_popup_window.rs
@@ -5,7 +5,7 @@
 
 
 use app_state::*;
-use audio::*;
+use audio_frontend::*;
 use errors::*;
 use gdk::DeviceExt;
 use gdk::{GrabOwnership, GrabStatus, BUTTON_PRESS_MASK, KEY_PRESS_MASK};
diff --git a/src/ui_prefs_dialog.rs b/src/ui_prefs_dialog.rs
index 736e3ceed..de3a41a51 100644
--- a/src/ui_prefs_dialog.rs
+++ b/src/ui_prefs_dialog.rs
@@ -3,7 +3,7 @@
 
 
 use app_state::*;
-use audio::*;
+use audio_frontend::*;
 use errors::*;
 use gdk;
 use gtk::ResponseType;
diff --git a/src/ui_tray_icon.rs b/src/ui_tray_icon.rs
index 3ebd52ac4..fa29ea61e 100644
--- a/src/ui_tray_icon.rs
+++ b/src/ui_tray_icon.rs
@@ -5,7 +5,7 @@
 
 
 use app_state::*;
-use audio::*;
+use audio_frontend::*;
 use errors::*;
 use gdk;
 use gdk_pixbuf;