Initial commit

This commit is contained in:
Julian Ospald 2017-06-26 09:08:37 +02:00
commit 342bdc38fd
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
17 changed files with 2028 additions and 0 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
target

13
Cargo.toml Normal file
View File

@ -0,0 +1,13 @@
[package]
name = "pnmixer"
version = "0.1.0"
authors = ["Julian Ospald <hasufell@posteo.de>"]
[dependencies]
alsa = "0.1.8"
gdk = "0.5.0"
lazy_static = "0.1.*"
[dependencies.gtk]
version = "0.1.0"
features = [ "v3_10" ]

View File

@ -0,0 +1,10 @@
[Desktop Entry]
Name=PNMixer
_GenericName=System Tray Mixer
_Comment=An audio mixer for the system tray
Exec=pnmixer
TryExec=pnmixer
Icon=pnmixer
Terminal=false
Type=Application
Categories=AudioVideo;

BIN
data/icons/pnmixer.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

190
data/ui/hotkey-dialog.glade Normal file
View File

@ -0,0 +1,190 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="hotkey_dialog">
<property name="width_request">300</property>
<property name="height_request">200</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title">Set xxx HotKey</property>
<property name="modal">True</property>
<property name="destroy_with_parent">True</property>
<property name="icon_name">input-keyboard</property>
<property name="type_hint">dialog</property>
<signal name="key-press-event" handler="on_hotkey_dialog_key_press_event" swapped="no"/>
<signal name="key-release-event" handler="on_hotkey_dialog_key_release_event" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button1">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<child>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">gtk-cancel</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">5</property>
<property name="label" translatable="yes">Cancel</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">10</property>
<property name="margin_end">10</property>
<property name="pixel_size">57</property>
<property name="icon_name">input-keyboard</property>
<property name="icon_size">3</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Defining HotKey</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="hotkey_reset_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">(press &lt;Ctrl&gt;C to reset)</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="instruction_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Press new HotKey for xxx</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="key_pressed_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">button1</action-widget>
</action-widgets>
</object>
</interface>

271
data/ui/popup-menu.glade Normal file
View File

@ -0,0 +1,271 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<object class="GtkWindow" id="menu_window">
<property name="can_focus">False</property>
<property name="type">popup</property>
<property name="resizable">False</property>
<property name="window_position">mouse</property>
<property name="type_hint">utility</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<property name="decorated">False</property>
<child>
<object class="GtkMenuBar" id="menubar">
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">_Popup</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="mute_item">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Mute/Unmute Volume</property>
<signal name="activate" handler="on_mute_item_activate" swapped="no"/>
<child>
<object class="GtkBox" id="box0">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="mute_check">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">center</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAccelLabel" id="mute_accellabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">4</property>
<property name="margin_end">8</property>
<property name="label" translatable="yes">Mute</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkMenuItem" id="mixer_item">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Open Volume Control</property>
<signal name="activate" handler="on_mixer_item_activate" swapped="no"/>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="mixer_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">system-run</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAccelLabel" id="mixer_accellabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">4</property>
<property name="margin_end">8</property>
<property name="label" translatable="yes">Volume Control</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkMenuItem" id="prefs_item">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Preferences</property>
<signal name="activate" handler="on_prefs_item_activate" swapped="no"/>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="prefs_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">preferences-desktop</property>
<property name="icon_size">1</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAccelLabel" id="prefs_accellabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">4</property>
<property name="margin_end">8</property>
<property name="label" translatable="yes">Preferences</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkMenuItem" id="reload_item">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Reload Sound</property>
<signal name="activate" handler="on_reload_item_activate" swapped="no"/>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="reload_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">gtk-refresh</property>
<property name="icon_size">1</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAccelLabel" id="reload_accellabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">4</property>
<property name="margin_end">8</property>
<property name="label" translatable="yes">Reload Sound</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkMenuItem" id="about_item">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">About</property>
<signal name="activate" handler="on_about_item_activate" swapped="no"/>
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="about_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">help-about</property>
<property name="icon_size">1</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAccelLabel" id="about_accellabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">4</property>
<property name="margin_end">8</property>
<property name="label" translatable="yes">About</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="separatormenuitem2">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="quit_item">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Quit</property>
<signal name="activate" handler="gtk_main_quit" swapped="no"/>
<child>
<object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="quit_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">gtk-quit</property>
<property name="icon_size">1</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAccelLabel" id="quit_accellabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">4</property>
<property name="margin_end">8</property>
<property name="label" translatable="yes">Quit</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</interface>

View File

@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<object class="GtkAdjustment" id="vol_scale_adj">
<property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkWindow" id="popup_window">
<property name="type">popup</property>
<property name="can_focus">False</property>
<property name="resizable">False</property>
<property name="window_position">mouse</property>
<property name="type_hint">utility</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<property name="decorated">False</property>
<signal name="button-press-event" handler="on_popup_window_event" swapped="no"/>
<signal name="grab-broken-event" handler="on_popup_window_event" swapped="no"/>
<signal name="key-press-event" handler="on_popup_window_event" swapped="no"/>
<child>
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="margin">8</property>
<property name="spacing">12</property>
<child>
<object class="GtkScale" id="vol_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="orientation">horizontal</property>
<property name="adjustment">vol_scale_adj</property>
<property name="inverted">False</property>
<property name="round_digits">0</property>
<property name="digits">0</property>
<property name="width_request">200</property>
<signal name="value-changed" handler="on_vol_scale_value_changed" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="mute_check">
<property name="label" translatable="yes">Mute</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_mute_check_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="mixer_button">
<property name="label" translatable="yes">Mixer</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_mixer_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</interface>

View File

@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<object class="GtkAdjustment" id="vol_scale_adj">
<property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkWindow" id="popup_window">
<property name="type">popup</property>
<property name="can_focus">False</property>
<property name="resizable">False</property>
<property name="window_position">mouse</property>
<property name="type_hint">utility</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<property name="decorated">False</property>
<signal name="button-press-event" handler="on_popup_window_event" swapped="no"/>
<signal name="grab-broken-event" handler="on_popup_window_event" swapped="no"/>
<signal name="key-press-event" handler="on_popup_window_event" swapped="no"/>
<child>
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="margin">8</property>
<property name="spacing">12</property>
<child>
<object class="GtkScale" id="vol_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="orientation">vertical</property>
<property name="adjustment">vol_scale_adj</property>
<property name="inverted">True</property>
<property name="round_digits">0</property>
<property name="digits">0</property>
<property name="height_request">200</property>
<signal name="value-changed" handler="on_vol_scale_value_changed" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">4</property>
<child>
<object class="GtkCheckButton" id="mute_check">
<property name="label" translatable="yes">Mute</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_mute_check_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="mixer_button">
<property name="label" translatable="yes">Mixer</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="on_mixer_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</interface>

1225
data/ui/prefs-dialog.glade Normal file

File diff suppressed because it is too large Load Diff

50
src/audio.rs Normal file
View File

@ -0,0 +1,50 @@
extern crate alsa;
use self::alsa::card::{Card};
use self::alsa::mixer::{Mixer, Selem};
pub fn get_default_alsa_card() -> Card {
let default_card: Card = Card::new(0);
return default_card;
}
pub fn get_mixer(card: Card) -> Mixer {
let mixer = Mixer::new(&format!("hw:{}", card.get_index()),
false).unwrap();
for elem in mixer.iter() {
let selem: Selem = Selem::new(elem).unwrap();
println!("Elem: {}", selem.get_id().get_name().unwrap());
}
return mixer;
}
pub fn get_channels(mixer: &Mixer) -> alsa::mixer::Iter {
return mixer.iter();
}
pub fn get_channel_by_name<'a>(mixer: &'a Mixer, name: String) -> Option<Selem<'a>> {
for elem in mixer.iter() {
let m_selem = Selem::new(elem);
let m_name = m_selem.and_then(|x| x.get_id().get_name().ok());
let retval = m_name.map_or(false, |n| {
return n == name;
});
if retval {
return Selem::new(elem);
}
}
return None;
}
// pub fn list_channels(card: Card, hctl: HCtl) -> [str] {
// }

71
src/main.rs Normal file
View File

@ -0,0 +1,71 @@
extern crate gtk;
extern crate gdk;
extern crate alsa;
// #[macro_use]
// extern crate lazy_static;
// use gdk::EventButton;
// use gdk::EventType;
// use std::ops::Deref;
// use std::boxed::Box;
// use std::rc::Rc;
// use std::sync::Arc;
use gtk::prelude::*;
use alsa::mixer::SelemChannelId::*;
mod audio;
fn main() {
gtk::init().unwrap();
let tray_icon = gtk::StatusIcon::new_from_icon_name("pnmixer");
let glade_src = include_str!("../data/ui/popup-window-vertical.glade");
let builder_popup = gtk::Builder::new_from_string(glade_src);
let popup_window: gtk::Window = builder_popup.get_object("popup_window").unwrap();
// let builder_prefs_dialog = Rc::new(Builder::new_from_file("data/ui/prefs-dialog.glade"));
// with_builder!(builder_popup_window,
// tray_icon.connect_activate(move |_| {
// let popup_window: gtk::Window = builder
// .get_object("popup_window").unwrap();
// popup_window.show_all();
// })
// );
// 2nd binding
tray_icon.connect_button_press_event(move |_, e| {
let bt = e.as_ref().button;
match bt {
3 => {
popup_window.show_all();
return true;
}
_ => {
println!("Blah");
return false;
}
}
});
let alsa_card = audio::get_default_alsa_card();
let mixer = audio::get_mixer(alsa_card);
let channel = audio::get_channel_by_name(&mixer, String::from("Master")).unwrap();
println!("Range: {:?}", channel.get_playback_volume_range());
println!("Channel: {}", channel.get_playback_volume(FrontCenter).unwrap());
tray_icon.set_visible(true);
gtk::main();
}