Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-09-17 17:00:27 +02:00
Code Issues Projects Releases Wiki Activity

2023-12-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Renamed a parameter in the 'Driver::unloadRecord()' method in
	caed(8).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2023-12-18 12:38:01 -05:00
parent 9e112b433f
commit 1bd4955ce4
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -24574,3 +24574,6 @@
* Fixed a regression in the 'Cut Info / Record' dialog in
rdlibrary(1) that caused the audio meter to fail to be zeroed
when resetting from record ready.
2023-12-18 Fred Gleason <fredg@paravelsystems.com>
* Renamed a parameter in the 'Driver::unloadRecord()' method in
caed(8).

4
cae/driver.h
View File

@ -2,7 +2,7 @@
//
// Abstract base class for caed(8) audio driver implementations.
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2023 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -59,7 +59,7 @@ class Driver : public QObject
virtual bool timescaleSupported(int card)=0;
virtual bool loadRecord(int card,int port,int coding,int chans,int samprate,
int bitrate,QString wavename)=0;
virtual bool unloadRecord(int card,int stream,unsigned *len)=0;
virtual bool unloadRecord(int card,int stream,unsigned *len_frames)=0;
virtual bool record(int card,int stream,int length,int thres)=0;
virtual bool stopRecord(int card,int stream)=0;
virtual bool setClockSource(int card,int src)=0;

6
cae/driver_alsa.cpp
View File

@ -1026,15 +1026,15 @@ bool DriverAlsa::loadRecord(int card,int port,int coding,int chans,int samprate,
}
bool DriverAlsa::unloadRecord(int card,int port,unsigned *len)
bool DriverAlsa::unloadRecord(int card,int port,unsigned *len_frames)
{
#ifdef ALSA
alsa_recording[card][port]=false;
alsa_ready[card][port]=false;
EmptyAlsaInputStream(card,port);
*len=alsa_samples_recorded[card][port];
*len_frames=alsa_samples_recorded[card][port];
alsa_samples_recorded[card][port]=0;
alsa_record_wave[card][port]->closeWave(*len);
alsa_record_wave[card][port]->closeWave(*len_frames);
delete alsa_record_wave[card][port];
alsa_record_wave[card][port]=NULL;
delete alsa_record_ring[card][port];

2
cae/driver_alsa.h
View File

@ -66,7 +66,7 @@ class DriverAlsa : public Driver
bool timescaleSupported(int card);
bool loadRecord(int card,int port,int coding,int chans,int samprate,
int bitrate,QString wavename);
bool unloadRecord(int card,int port,unsigned *len);
bool unloadRecord(int card,int port,unsigned *len_frames);
bool record(int card,int port,int length,int thres);
bool stopRecord(int card,int port);
bool setClockSource(int card,int src);

6
cae/driver_jack.cpp
View File

@ -1003,7 +1003,7 @@ bool DriverJack::loadRecord(int card,int port,int coding,int chans,int samprate,
}
bool DriverJack::unloadRecord(int card,int port,unsigned *len)
bool DriverJack::unloadRecord(int card,int port,unsigned *len_frames)
{
#ifdef JACK
if((port <0)||(port>=RD_MAX_PORTS)) {
@ -1012,9 +1012,9 @@ bool DriverJack::unloadRecord(int card,int port,unsigned *len)
jack_recording[port]=false;
jack_ready[port]=false;
EmptyJackInputStream(port,true);
*len=jack_samples_recorded[port];
*len_frames=jack_samples_recorded[port];
jack_samples_recorded[port]=0;
jack_record_wave[port]->closeWave(*len);
jack_record_wave[port]->closeWave(*len_frames);
delete jack_record_wave[port];
jack_record_wave[port]=NULL;
delete jack_record_ring[port];

2
cae/driver_jack.h
View File

@ -54,7 +54,7 @@ class DriverJack : public Driver
bool timescaleSupported(int card);
bool loadRecord(int card,int port,int coding,int chans,int samprate,
int bitrate,QString wavename);
bool unloadRecord(int card,int port,unsigned *len);
bool unloadRecord(int card,int port,unsigned *len_frames);
bool record(int card,int port,int length,int thres);
bool stopRecord(int card,int port);
bool setClockSource(int card,int src);