Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-30 15:39:31 +02:00
Code Issues Projects Releases Wiki Activity

2019-06-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'UseStreamMeters=' directive from the '[Hacks]'
	section of rd.conf(5).
This commit is contained in:
Fred Gleason 2019-06-17 18:10:38 -04:00
parent 6a87f19917
commit 94d7544574
7 changed files with 6 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18774,3 +18774,6 @@
and 'LogPattern=' directives from rd.conf(5).
2019-06-17 Fred Gleason <fredg@paravelsystems.com>
* Removed the sas_shim(1) utility.
2019-06-17 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'UseStreamMeters=' directive from the '[Hacks]'
section of rd.conf(5).

14
cae/cae_hpi.cpp
View File

@ -480,20 +480,6 @@ bool MainObject::hpiGetInputMeters(int card,int port,short levels[2])
bool MainObject::hpiGetOutputMeters(int card,int port,short levels[2])
{
#ifdef HPI
if(rd_config->useStreamMeters()) {
//
// This is UGLY, but needed to semi-support cards (like the ASI4215)
// that lack output port metering.
//
for(int i=0;i<RD_MAX_STREAMS;i++) {
if(sound_card->getOutputVolume(card,i,port)>-10000) {
return sound_card->outputStreamMeter(card,i,levels);
}
}
levels[0]=-10000;
levels[1]=-10000;
return true;
}
return sound_card->outputPortMeter(card,port,levels);
#else
return false;

26
conf/rd.conf-sample
View File

@ -116,34 +116,10 @@ RealtimePriority=9
; when transcoding files.
TranscodingDelay=0
[Hacks]
; If you are getting no output level meter indications with an older
; ASI card (such as the ASI4215, ASI4113 or ASI4111), try uncommenting
; the following line:
; UseStreamMeters=Yes
[Hacks]
; Completely disable maintenance checks on this host.
; DisableMaintChecks=Yes
; Lock memory in RDAirPlay
; LockRdairplayMemory=Yes
;
; Log Generation (old method, deprecated)
;
; These sections are here strictly for backward compatibility. See
; the [Logs] section for a much more powerful way to configure
; logging.
;
; [RDAirPlay]
; Logfile=/home/rd/rdairplay.log
;
; [RDCatchd]
; Logfile=/home/rd/rdcatchd.log
;
; [Ripcd]
; Logfile=/home/rd/ripcd.log
;
; [Caed]
; Logfile=/home/rd/caed.log
; EnableMixerLogging=No

9
lib/rdconfig.cpp
View File

@ -333,12 +333,6 @@ QString RDConfig::jackPort(int num,int endpt) const
}
bool RDConfig::useStreamMeters() const
{
return conf_use_stream_meters;
}
bool RDConfig::disableMaintChecks() const
{
return conf_disable_maint_checks;
@ -541,7 +535,7 @@ bool RDConfig::load()
conf_alsa_period_size=
profile->intValue("Alsa","PeriodSize",RD_ALSA_DEFAULT_PERIOD_SIZE);
conf_alsa_channels_per_pcm=profile->intValue("Alsa","ChannelsPerPcm",-1);
conf_use_stream_meters=profile->boolValue("Hacks","UseStreamMeters",false);
conf_disable_maint_checks=
profile->boolValue("Hacks","DisableMaintChecks",false);
conf_lock_rdairplay_memory=
@ -658,7 +652,6 @@ void RDConfig::clear()
conf_audio_store_cae_hostname="";
conf_jack_ports[0].clear();
conf_jack_ports[1].clear();
conf_use_stream_meters=false;
conf_disable_maint_checks=false;
conf_lock_rdairplay_memory=false;
conf_uid=65535;

2
lib/rdconfig.h
View File

@ -93,7 +93,6 @@ class RDConfig
QString audioStoreXportHostname() const;
int jackConnections() const;
QString jackPort(int num,int endpt) const;
bool useStreamMeters() const;
bool disableMaintChecks() const;
bool lockRdairplayMemory() const;
bool enableMixerLogging() const;
@ -158,7 +157,6 @@ class RDConfig
QString conf_audio_store_mount_options;
QString conf_audio_store_xport_hostname;
QString conf_audio_store_cae_hostname;
bool conf_use_stream_meters;
bool conf_disable_maint_checks;
bool conf_lock_rdairplay_memory;
std::vector<QString> conf_jack_ports[2];

5
rdairplay/rdairplay.cpp
View File

@ -415,10 +415,7 @@ MainWidget::MainWidget(QWidget *parent)
air_stereo_meter->setGeometry(50,70,air_stereo_meter->sizeHint().width(),
air_stereo_meter->sizeHint().height());
air_stereo_meter->setMode(RDSegMeter::Peak);
air_stereo_meter->setFocusPolicy(Qt::NoFocus);
if(rda->config()->useStreamMeters()) {
air_stereo_meter->hide();
}
air_stereo_meter->setFocusPolicy(Qt::NoFocus);
//
// Message Label

3
rdpanel/rdpanel.cpp
View File

@ -269,9 +269,6 @@ MainWidget::MainWidget(QWidget *parent)
panel_stereo_meter->sizeHint().height());
panel_stereo_meter->setMode(RDSegMeter::Peak);
panel_stereo_meter->setFocusPolicy(Qt::NoFocus);
if(rda->config()->useStreamMeters()) {
panel_stereo_meter->hide();
}
//
// Empty Cart