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

2021-02-15 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'Q3Signal' dependency from 'RDCut'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-02-15 19:37:34 -05:00
parent 7b48464f6e
commit 15f1636a62
4 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21166,3 +21166,5 @@
* Removed the 'Q3Url' dependency from 'RDUrl'. * Removed the 'Q3Url' dependency from 'RDUrl'.
2021-02-15 Fred Gleason <fredg@paravelsystems.com> 2021-02-15 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3CString' dependency from 'RDWaveFile'. * Removed the 'Q3CString' dependency from 'RDWaveFile'.
2021-02-15 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3Signal' dependency from 'RDCut'.

23
lib/rdcut.cpp
View File

@ -2,7 +2,7 @@
// //
// Abstract a Rivendell Cut. // Abstract a Rivendell Cut.
// //
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -46,8 +46,6 @@ RDCut::RDCut(const QString &name,bool create)
{ {
cut_name=name; cut_name=name;
cut_signal=new Q3Signal();
if(name.isEmpty()) { if(name.isEmpty()) {
cut_number=0; cut_number=0;
cart_number=0; cart_number=0;
@ -66,8 +64,6 @@ RDCut::RDCut(unsigned cartnum,int cutnum,bool create)
{ {
cut_name=RDCut::cutName(cartnum,cutnum); cut_name=RDCut::cutName(cartnum,cutnum);
cut_signal=new Q3Signal();
if(create) { if(create) {
RDCut::create(cut_name); RDCut::create(cut_name);
} }
@ -78,7 +74,6 @@ RDCut::RDCut(unsigned cartnum,int cutnum,bool create)
RDCut::~RDCut() RDCut::~RDCut()
{ {
delete cut_signal;
} }
@ -1519,18 +1514,6 @@ void RDCut::reset() const
} }
void RDCut::connect(QObject *receiver,const char *member) const
{
cut_signal->connect(receiver,member);
}
void RDCut::disconnect(QObject *receiver,const char *member) const
{
cut_signal->disconnect(receiver,member);
}
QString RDCut::xml(RDSqlQuery *q,bool absolute,RDSettings *settings) QString RDCut::xml(RDSqlQuery *q,bool absolute,RDSettings *settings)
{ {
// //
@ -1822,14 +1805,10 @@ bool RDCut::FileCopy(const QString &srcfile,const QString &destfile) const
write(dest_fd,buf,dest_stat.st_blksize); write(dest_fd,buf,dest_stat.st_blksize);
bytes+=dest_stat.st_blksize; bytes+=dest_stat.st_blksize;
if((step=10*bytes/src_stat.st_size)!=previous_step) { if((step=10*bytes/src_stat.st_size)!=previous_step) {
cut_signal->setValue(step);
cut_signal->activate();
previous_step=step; previous_step=step;
} }
} }
write(dest_fd,buf,n); write(dest_fd,buf,n);
cut_signal->setValue(10);
cut_signal->activate();
free(buf); free(buf);
close(src_fd); close(src_fd);
close(dest_fd); close(dest_fd);

9
lib/rdcut.h
View File

@ -2,7 +2,7 @@
// //
// Abstract a Rivendell Cut // Abstract a Rivendell Cut
// //
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // 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. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#include <qsqldatabase.h> #include <QObject>
#include <q3signal.h>
#include <qobject.h>
#include <rdconfig.h> #include <rdconfig.h>
#include <rddb.h> #include <rddb.h>
@ -145,8 +143,6 @@ class RDCut
void autoSegue(int level,int length,RDStation *station,RDUser *user, void autoSegue(int level,int length,RDStation *station,RDUser *user,
RDConfig *config); RDConfig *config);
void reset() const; void reset() const;
void connect(QObject *receiver,const char *member) const;
void disconnect(QObject *receiver,const char *member) const;
static QString xml(RDSqlQuery *q,bool absolute,RDSettings *settings=NULL); static QString xml(RDSqlQuery *q,bool absolute,RDSettings *settings=NULL);
static QString cutName(unsigned cartnum,unsigned cutnum); static QString cutName(unsigned cartnum,unsigned cutnum);
static unsigned cartNumber(const QString &cutname); static unsigned cartNumber(const QString &cutname);
@ -169,7 +165,6 @@ class RDCut
void SetRow(const QString &param) const; void SetRow(const QString &param) const;
static void GetDefaultDateTimes(QString *start_dt,QString *end_dt, static void GetDefaultDateTimes(QString *start_dt,QString *end_dt,
const QString &cutname); const QString &cutname);
Q3Signal *cut_signal;
QString cut_name; QString cut_name;
unsigned cart_number; unsigned cart_number;
unsigned cut_number; unsigned cut_number;

2
rdlibrary/audio_cart.cpp
View File

@ -388,10 +388,8 @@ void AudioCart::pasteCutData()
return; return;
} }
} }
cut_clipboard->connect(this,SLOT(copyProgressData(const QVariant &)));
cut_clipboard->copyTo(rda->station(),rda->user(), cut_clipboard->copyTo(rda->station(),rda->user(),
rdcart_cut_model->cutName(row),rda->config()); rdcart_cut_model->cutName(row),rda->config());
cut_clipboard->disconnect(this,SLOT(copyProgressData(const QVariant &)));
rdcart_cart->updateLength(rdcart_controls->enforce_length_box->isChecked(), rdcart_cart->updateLength(rdcart_controls->enforce_length_box->isChecked(),
QTime().msecsTo(rdcart_controls-> QTime().msecsTo(rdcart_controls->
forced_length_edit->time())); forced_length_edit->time()));