Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-16 15:41:13 +02:00
Code Issues Projects Releases Wiki Activity

2023-10-09 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed regressions in rdlibrary(1)'s 'Cut Info/Record' and 'Edit
	Audio' dialogs that broke audio stoppage and looping.
	* Fixed a regression in caed(1) that caused play-out streams to
	be leaked when a play-out hit EOF.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-10-09 14:57:26 -04:00
parent 8f94026e36
commit 4c7e11116e
6 changed files with 27 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lib/rdmarkerplayer.cpp
View File

@@ -39,8 +39,6 @@ RDMarkerPlayer::RDMarkerPlayer(int card,int port,QWidget *parent)
rda->cae()->enableMetering(&d_cards);
connect(rda->cae(),SIGNAL(playbackStopped(int)),
this,SLOT(playbackStoppedData(int)));
// connect(rda->cae(),SIGNAL(playPositionChanged(int,unsigned)),
// this,SLOT(caePositionData(int,unsigned)));
//
// Marker Readouts
@@ -536,70 +534,31 @@ void RDMarkerPlayer::meterData()
d_meter->setRightPeakBar(lvls[1]);
}
/*
void RDMarkerPlayer::caePlayedData(int serial)
{
printf("d_cae_serial2: %d serial: %d\n",d_cae_serial,serial);
printf("HERE10\n");
if(serial==d_cae_serial) {
printf("HERE11\n");
if(!d_is_playing) {
printf("HERE12\n");
d_active_play_button->setState(RDTransportButton::On);
d_stop_button->setState(RDTransportButton::Off);
d_is_playing=true;
if(!d_position_timer->isActive()) {
printf("HERE13\n");
d_position_timer->start(RDMARKERPLAYER_POSITION_INTERVAL);
}
}
}
}
*/
void RDMarkerPlayer::playbackStoppedData(int serial)
{
if(serial==d_cae_serial) {
if(d_is_playing) {
if(d_looping) {
rda->cae()->startPlayback(RDCut::cutName(d_cart_number,d_cut_number),
d_cards.first(),d_port,
d_loop_start_msec,
d_loop_start_msec+d_loop_start_length,
RD_TIMESCALE_DIVISOR);
Play();
rda->cae()->setPlayPortActive(d_cards.first(),d_port,d_cae_stream);
if(d_meter_timer->isActive()) {
d_meter_timer->stop();
d_meter->setLeftPeakBar(-10000);
d_meter->setRightPeakBar(-10000);
}
else {
if(d_meter_timer->isActive()) {
d_meter_timer->stop();
d_meter->setLeftPeakBar(-10000);
d_meter->setRightPeakBar(-10000);
}
d_play_from_button->setState(RDTransportButton::Off);
d_play_button->setState(RDTransportButton::Off);
d_play_to_button->setState(RDTransportButton::Off);
d_stop_button->setState(RDTransportButton::On);
d_is_playing=false;
d_position_timer->stop();
d_play_from_button->setState(RDTransportButton::Off);
d_play_button->setState(RDTransportButton::Off);
d_play_to_button->setState(RDTransportButton::Off);
d_stop_button->setState(RDTransportButton::On);
d_is_playing=false;
d_position_timer->stop();
if(d_looping) {
buttonPlayFromData();
}
}
}
}
void RDMarkerPlayer::caePositionData(int serial,unsigned msec)
{
/*
if(serial==d_cae_serial) {
d_position_edit->setText(RDGetTimeLength(msec-d_pointers[RDMarkerHandle::CutStart],true,true));
d_cursor_position=msec;
emit cursorPositionChanged(msec);
}
*/
}
void RDMarkerPlayer::trimThresholdChanged(int dbfs)
{
d_trim_start_button->setDisabled(dbfs==0);
@@ -612,7 +571,6 @@ void RDMarkerPlayer::positionTimeoutData()
d_cursor_position+=RDMARKERPLAYER_POSITION_INTERVAL;
d_position_edit->setText(RDGetTimeLength(d_cursor_position-d_pointers[RDMarkerHandle::CutStart],true,true));
emit cursorPositionChanged(d_cursor_position);
printf("d_cursor_position: %d\n",d_cursor_position);
}

3
lib/rdmarkerplayer.h
View File

@@ -2,7 +2,7 @@
//
// Audio player for RDMarkerDialog
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-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
@@ -82,7 +82,6 @@ class RDMarkerPlayer : public RDWidget
void readoutClickedData(int role);
void meterData();
void playbackStoppedData(int serial);
void caePositionData(int handle,unsigned pos);
void trimThresholdChanged(int dbfs);
void positionTimeoutData();