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

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

Browse Source 
* Fixed a regression in rdlibrary(1) that broke the audio audition
	button on the main window.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-10-09 13:51:30 -04:00
parent 62f9e7ba86
commit 8f94026e36
5 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -24431,3 +24431,6 @@
* Fixed a bug in caed(8) that broke metering CAE commands.
2023-09-20 Fred Gleason <fredg@paravelsystems.com>
* Modified 'RDMarkerPlayer' to work with revised 'RDCae'.
2023-10-09 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlibrary(1) that broke the audio audition
button on the main window.

66
lib/rdsimpleplayer.cpp
View File

@@ -2,7 +2,7 @@
//
// A naively simple player for Rivendell Carts.
//
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@@ -34,7 +34,7 @@ RDSimplePlayer::RDSimplePlayer(RDCae *cae,RDRipc *ripc,int card,int port,
play_port=port;
play_start_cart=start_cart;
play_end_cart=end_cart;
play_stream=-1;
play_serial=-1;
play_cart=0;
play_cut="";
play_is_playing=false;
@@ -42,8 +42,8 @@ RDSimplePlayer::RDSimplePlayer(RDCae *cae,RDRipc *ripc,int card,int port,
//
// RDCae Connections
//
connect(play_cae,SIGNAL(playing(int)),this,SLOT(playingData(int)));
connect(play_cae,SIGNAL(playStopped(int)),this,SLOT(playStoppedData(int)));
connect(play_cae,SIGNAL(playbackStopped(int)),
this,SLOT(playStoppedData(int)));
//
// Event Player
@@ -127,8 +127,6 @@ void RDSimplePlayer::play()
void RDSimplePlayer::play(int start_pos)
{
int handle=0;
int play_cut_gain=0;
QString sql;
RDSqlQuery *q;
@@ -145,13 +143,6 @@ void RDSimplePlayer::play(int start_pos)
delete cart;
}
if(!play_cut.isEmpty()) {
// play_cae->
// loadPlay(play_card,play_cut,&play_stream,&handle);
if(play_stream<0) {
return;
}
sql=QString("select ")+
"`START_POINT`,"+ // 00
"`END_POINT`,"+ // 01
@@ -160,19 +151,33 @@ void RDSimplePlayer::play(int start_pos)
"`CUT_NAME`='"+RDEscapeString(play_cut)+"'";
q=new RDSqlQuery(sql);
if(q->first()) {
play_cut_gain=q->value(2).toInt();
/*
play_handles.push(handle);
for(int i=0;i<RD_MAX_PORTS;i++) {
play_cae->setOutputVolume(play_card,play_stream,i,RD_MUTE_DEPTH);
}
play_cae->setOutputVolume(play_card,play_stream,play_port,0+play_cut_gain);
play_cae->positionPlay(play_handles.back(),q->value(0).toUInt()+start_pos);
/*
play_cae->play(play_handles.back(),
q->value(1).toUInt()-(q->value(0).toUInt()+start_pos),
RD_TIMESCALE_DIVISOR,false);
*/
play_cae->setPlayPortActive(play_card,play_port,play_stream);
//
// FIXME: implement cut gain!
// play_cut_gain=q->value(2).toInt();
play_serial=
play_cae->startPlayback(play_cut,play_card,play_port,
q->value(0).toInt()+start_pos,
q->value(1).toInt(),
RD_TIMESCALE_DIVISOR);
// play_cae->setPlayPortActive(play_card,play_port,play_stream);
if(play_serial>0) {
play_event_player->exec(play_start_cart);
play_start_button->on();
play_stop_button->off();
play_is_playing=true;
emit played();
}
}
delete q;
}
@@ -184,39 +189,18 @@ void RDSimplePlayer::stop()
if(!play_is_playing) {
return;
}
// play_cae->stopPlay(play_handles.back());
}
void RDSimplePlayer::playingData(int handle)
{
if(play_handles.empty()) {
return;
}
if(handle!=play_handles.back()) {
return;
}
play_event_player->exec(play_start_cart);
play_start_button->on();
play_stop_button->off();
play_is_playing=true;
emit played();
play_cae->stopPlayback(play_serial);
play_cut="";
play_is_playing=false;
}
void RDSimplePlayer::playStoppedData(int handle)
{
if(play_handles.empty()) {
return;
}
if(handle!=play_handles.front()) {
return;
}
// play_cae->unloadPlay(play_handles.front());
play_event_player->exec(play_end_cart);
play_start_button->off();
play_stop_button->on();
play_handles.pop();
play_is_playing=false;
emit stopped();
}

10
lib/rdsimpleplayer.h
View File

@@ -2,7 +2,7 @@
//
// A naively simple player for Rivendell Carts.
//
// (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@@ -18,9 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <queue>
#include <qwidget.h>
#include <QWidget>
#include <rdtransportbutton.h>
#include <rdcae.h>
@@ -54,16 +52,14 @@ class RDSimplePlayer : public QWidget
void stopped();
private slots:
void playingData(int handle);
void playStoppedData(int handle);
private:
RDCae *play_cae;
RDRipc *play_ripc;
int play_card;
int play_stream;
int play_serial;
int play_port;
std::queue<int> play_handles;
unsigned play_cart;
QString play_cut;
unsigned play_start_cart;

6
rdlibrary/rdlibrary.cpp
View File

@@ -631,6 +631,9 @@ void MainWidget::selectionChangedData(const QItemSelection &,
lib_player->stopButton()->setEnabled(carts.size()==1);
lib_player->setCart(lib_cart_model->cartNumber(carts.first()));
SetPlayer(lib_cart_model->cartType(carts.first()));
if(lib_player->isPlaying()) {
lib_player->play();
}
}
else {
lib_edit_button->setEnabled(false);
@@ -640,6 +643,9 @@ void MainWidget::selectionChangedData(const QItemSelection &,
if(cuts.size()>=1) {
lib_player->setCart(lib_cart_model->cartNumber(cuts.first()));
lib_player->setCut(lib_cart_model->cutName(cuts.first()));
if(lib_player->isPlaying()) {
lib_player->play();
}
}
SetPlayer(lib_cart_model->cartType(cuts.first()));
}

7
rdservice/startup.cpp
View File

@@ -65,6 +65,13 @@ bool MainObject::Startup(QString *err_msg)
return true;
}
//
// *** BAND-AID * BAND_AID * YEECH! ***
// This Makes It Work, but I think we're going to need to implement
// socket activation on all of these services.
//
sleep(1);
//
// ripcd(8)
//