Skip to content

Commit

Permalink
4.2 production
Browse files Browse the repository at this point in the history
  • Loading branch information
moodeaudio committed Jul 12, 2018
1 parent 3267288 commit 238b251
Show file tree
Hide file tree
Showing 640 changed files with 13,896 additions and 10,026 deletions.
4 changes: 3 additions & 1 deletion etc/bluealsaaplay.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#
# 2018-01-26 TC moOde 4.0
# 2018-07-11 TC moOde 4.2
# - change from hw to plughw
#

AUDIODEV=hw:0,0
AUDIODEV=plughw:0,0
19 changes: 0 additions & 19 deletions etc/bluetooth/audio.conf

This file was deleted.

22 changes: 16 additions & 6 deletions etc/bluetooth/main.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#
# 2018-01-26 TC moOde 4.0
# 2018-07-11 TC moOde 4.2
# - update for 5.49 conf: add [GATT], remmove AutoConnectTimeout
# - change ControllerMode from dual to bredr to enable Pi-to-Pi connections
#

[General]
Expand All @@ -21,12 +24,6 @@ DiscoverableTimeout = 0
# 0 = disable timer, i.e. stay pairable forever
#PairableTimeout = 0

# Automatic connection for bonded devices driven by platform/user events.
# If a platform plugin uses this mechanism, automatic connections will be
# enabled during the interval defined below. Initially, this feature
# intends to be used to establish connections to ATT channels. Default is 60.
#AutoConnectTimeout = 60

# Use vendor id source (assigner), vendor, product and version information for
# DID profile support. The values are separated by ":" and assigner, VID, PID
# and version.
Expand All @@ -52,6 +49,7 @@ DiscoverableTimeout = 0
# is "dual", i.e. both BR/EDR and LE enabled (when supported by the HW).
# Possible values: "dual", "bredr", "le"
#ControllerMode = dual
ControllerMode = bredr

# Enables Multi Profile Specification support. This allows to specify if
# system supports only Multiple Profiles Single Device (MPSD) configuration
Expand All @@ -74,6 +72,18 @@ DiscoverableTimeout = 0
# Defaults to "off"
# Privacy = off

[GATT]
# GATT attribute cache.
# Possible values:
# always: Always cache attributes even for devices not paired, this is
# recommended as it is best for interoperability, with more consistent
# reconnection times and enables proper tracking of notifications for all
# devices.
# yes: Only cache attributes of paired devices.
# no: Never cache attributes
# Default: always
#Cache = always

[Policy]
#
# The ReconnectUUIDs defines the set of remote services that should try
Expand Down
14 changes: 12 additions & 2 deletions etc/samba/smb.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#
# 2018-01-26 TC moOde 4.0
# 2018-07-11 TC moOde 4.2
# - add Playlists share point
# - add veto param for the annoying OSX fork files
#

[global]
Expand All @@ -19,17 +22,24 @@ dns proxy = No
create mask = 0775
directory mask = 0775
browseable = Yes
veto files = /._*/.DS_Store/
delete veto files = yes
[NAS]
comment = NAS Shares
path = /mnt/NAS
read only = No
guest ok = Yes
[RADIO]
[Playlists]
comment = Playlist Directory
path = /var/lib/mpd/playlists
read only = No
guest ok = Yes
[Radio]
comment = RADIO Stations
path = /var/lib/mpd/music/RADIO
read only = No
guest ok = Yes
[SDCARD]
[SDCard]
comment = SDCARD Storage
path = /mnt/SDCARD
read only = No
Expand Down
7 changes: 4 additions & 3 deletions etc/systemd/system/bluealsa.service
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#
# 2018-01-26 TC moOde 4.0
# 2018-07-11 TC moOde 4.2
# - add profiles required by latest bluez-alsa build
# - remove User=bluealsa, Group=Audio since they don't appear to be needed
#

[Unit]
Expand All @@ -9,9 +12,7 @@ After=bluetooth.service

[Service]
Type=simple
#User=pi
#Group=audio
ExecStart=/usr/bin/bluealsa
ExecStart=/usr/bin/bluealsa -p a2dp-source -p a2dp-sink

[Install]
WantedBy=multi-user.target
55 changes: 55 additions & 0 deletions home/sysmon.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#!/usr/bin/php
<?php
/**
* moOde audio player (C) 2014 Tim Curtis
* http://moodeaudio.org
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* This Program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* 2018-07-11 TC moOde 4.2
*
*/

while(true) {
// cpu frequency
$cpufreq = file_get_contents('/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq');
if ($cpufreq < 1000000) {
$cpufreq = number_format($cpufreq / 1000, 0, '.', '');
$cpufreq .= ' MHz';
}
else {
$cpufreq = number_format($cpufreq / 1000000, 1, '.', '');
$cpufreq .= ' GHz';
}

// cpu temp
$cputemp = substr(file_get_contents('/sys/class/thermal/thermal_zone0/temp'), 0, 2);

// cpu utilization
$cpuload = exec("top -bn 2 -d 0.75 | grep 'Cpu(s)' | tail -n 1 | awk '{print $2 + $4 + $6}'");
$cpuload = number_format($cpuload,0,'.','');
// memory utilization
$memtotal = exec("grep MemTotal /proc/meminfo | awk '{print $2}'");
$memavail = exec("grep MemAvailable /proc/meminfo | awk '{print $2}'");
$memutil = number_format(100 * (1 - ($memavail / $memtotal)), 0, '.', '');
// number of cores
$cores = trim(exec('grep -c ^processor /proc/cpuinfo'));
// cpu architecture
$sysarch = trim(shell_exec('uname -m'));
echo 'CPU: ' . $cpufreq . ' | LOAD: ' . $cpuload . '%' . ' | TEMP: ' . $cputemp . "\xB0" . 'C | RAM_USED: ' . $memutil . '%' . ' | CORES: ' . $cores . ' | ARCH: ' . $sysarch . "\r";
}
2 changes: 1 addition & 1 deletion mpd/RADIO/1.FM - Blues Radio.pls
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[playlist]
numberofentries=1
File1=http://69.46.90.84:8032
File1=http://strm112.1.fm/blues_mobile_mp3
Title1=1.FM - Blues Radio
Length1=-1
Version=2
2 changes: 1 addition & 1 deletion mpd/RADIO/JB Radio-2 (320K).pls
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[playlist]
numberofentries=1
File1=http://184.75.223.178/proxy/sdsyygqt?mp=/mp3-320
File1=http://cristina.torontocast.com:8007/mp3-320
Title1=JB Radio-2 (320K)
Length1=-1
version=2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[playlist]
numberofentries=1
File1=http://svr1.msmn.co:8136
Title1=CDNX 1 - Classic & New Indie Alt
Title1=NME 1 - Classic & New Indie Alt
Length1=-1
version=2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[playlist]
numberofentries=1
File1=http://msmn.co:8118
Title1=CDNX 2 - New & Upfront Indie Alt
Title1=NME 2 - New & Upfront Indie Alt
Length1=-1
version=2
6 changes: 0 additions & 6 deletions mpd/RADIO/Soma FM - Doomed.pls

This file was deleted.

6 changes: 0 additions & 6 deletions mpd/RADIO/WDET Detroit FM 101.9 - News And Music.pls

This file was deleted.

File renamed without changes.
6 changes: 5 additions & 1 deletion mpd/mpd.conf.default
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ follow_outside_symlinks "yes"
follow_inside_symlinks "yes"
zeroconf_enabled "no"
zeroconf_name "Moode MPD"
mixer_type "software"
gapless_mp3_playback "yes"
replaygain "off"
volume_normalization "no"
Expand Down Expand Up @@ -51,32 +50,37 @@ audio_output {
type "alsa"
name "ALSA default"
device "hw:0,0"
mixer_type "software"
dop "no"
}

audio_output {
type "alsa"
name "ALSA crossfeed"
device "crossfeed"
mixer_type "software"
dop "no"
}

audio_output {
type "alsa"
name "ALSA parametric eq"
device "eqfa4p"
mixer_type "software"
dop "no"
}

audio_output {
type "alsa"
name "ALSA graphic eq"
device "alsaequal"
mixer_type "software"
dop "no"
}

audio_output {
type "alsa"
name "ALSA bluetooth"
device "btstream"
mixer_type "software"
}
Binary file added other/bluetooth/BlueZ-master-4e926f8.zip
Binary file not shown.
Binary file removed other/bluetooth/bluez-5.49.tar.xz
Binary file not shown.
Binary file added other/bluetooth/bluez-alsa-master-88aefee.zip
Binary file not shown.
Loading

0 comments on commit 238b251

Please sign in to comment.