Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add option to combine channels #537

Merged
merged 2 commits into from
Feb 21, 2021
Merged

add option to combine channels #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5faf1ca
add option to combine channels
philippe44 Feb 21, 2021
81dd010
change strings + add changelog comment
philippe44 Feb 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Changelog8.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ <h2><a name="v8.2.0" id="v8.2.0"></a>Version 8.2.0</h2>
<li>New Features:</li>
<ul>
<li>Try to group online artists with local artists by ignoring slightly different spelling (eg. "The Beatles" vs. "Beatles", "Amy Macdonald" vs. "Amy MacDonald").</li>
<li>Audio option to combine channels to build a mono signal (whether player is synchronized or not).</li>
</ul>
<br />

Expand Down
1 change: 1 addition & 0 deletions HTML/EN/settings/player/audio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@
'0' => 'OUTPUT_CHANNELS_NORMAL',
'1' => 'OUTPUT_CHANNELS_LEFT',
'2' => 'OUTPUT_CHANNELS_RIGHT',
'3' => 'OUTPUT_CHANNELS_COMBINED',
} %]
<option [% IF prefs.pref_outputChannels == option.key %]selected [% END %]value="[% option.key %]">[% option.value | string %]</option>
[%- END -%]
Expand Down
4 changes: 2 additions & 2 deletions Slim/Player/Squeezebox.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,9 +879,9 @@ sub stream_s {

# If the output channels pref is set, and the player is synced to at least 1 other active player
# we tell the player to only play the desired channel. If not actively synced, the player will play
# in stereo.
# in stereo, unless channels are combined
if ( my $outputChannels = $prefs->client($client)->get('outputChannels') ) {
if ( $client->isSynced(1) ) { # use active player count
if ( $outputChannels == 0x03 || $client->isSynced(1) ) { # use active player count or this is L+R
$flags |= ($outputChannels & 0x03) << 2;
mherger marked this conversation as resolved.
Show resolved Hide resolved
}
}
Expand Down
8 changes: 6 additions & 2 deletions strings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5693,10 +5693,10 @@ SETUP_OUTPUT_CHANNELS_DESC
CS Tento přehrávač můžete nakonfigurovat, aby přehrával buď levý nebo pravý kanál. Tuto funkci můžete například využít k vytvoření stereo efektu ze 2 synchronizovaných rádií Squeezebox.
DA Du kan konfigurere afspilleren til kun at spille i den venstre eller højre kanal. Dette kan bruges til at oprette et stereobillede fra to synkroniserede Squeezebox-radioer, f.eks.
DE Sie können diesen Player so konfigurieren, dass er nur den linken oder rechten Kanal wiedergibt. Diese Option kann zum Beispiel verwendet werden, um ein Stereobild über zwei synchronisierte Squeezebox Radios zu erstellen.
EN You can configure this player to play only the left or right channel. This can be used to create a stereo image from 2 synced Squeezebox Radios, for example.
EN You can configure this player to play only the left or right channel. This can be used to create a stereo image from 2 synced Squeezebox Radios, for example. Both channels can also be combined to mono
ES Puede configurar este reproductor para que sólo reproduzca el canal izquierdo o el derecho. Se puede usar, por ejemplo, para crear una imagen estéreo a partir de dos dispositivos Squeezebox Radio sincronizados.
FI Voit määrittää soittimen toistamaan vain vasemmalla tai oikealla kanavalla. Näin voidaan luoda stereovaikutelma esimerkiksi kahdella synkronoidulla Squeezebox-radiolla.
FR Vous pouvez configurer cette platine pour lire uniquement le canal droit ou gauche. Cette configuration vous permet par exemple de créer une image stéréo à partir de deux radios Squeezebox synchronisées.
FR Vous pouvez configurer cette platine pour lire uniquement le canal droit ou gauche. Cette configuration vous permet par exemple de créer une image stéréo à partir de deux radios Squeezebox synchronisées. Les deux canaux peuvent aussi être combinés en mono
IT È possibile configurare il lettore affinché riproduca solo il canale destro o sinistro. Ciò risulta utile ad esempio per creare un'immagine stereo da due Squeezebox Radio sincronizzate.
NL Je kunt deze muziekspeler configureren zodat alleen via het linker- of rechterkanaal wordt afgespeeld. Zo kun je bijvoorbeeld 2 gesynchroniseerde Squeezebox Radio's in stereo-opstelling plaatsen.
NO Du kan konfigurere spilleren slik at den kun spiller fra venstre eller høyre kanal. Slik kan du blant annet skape et stereobilde fra to synkroniserte Squeezebox Radio-spillere.
Expand Down Expand Up @@ -5748,6 +5748,10 @@ OUTPUT_CHANNELS_RIGHT
PL Kanał prawy
RU Правый канал
SV Höger kanal

OUTPUT_CHANNELS_COMBINED
EN Both Channels (Mono)
FR Deux Canaux (Mono)

SETUP_TRANSITIONTYPE
CS Prolínání
Expand Down