2018-02-04 Fred Gleason <fredg@paravelsystems.com>

* Refactored the RDAudioConvert class to use RDApplication.
	* Converted rdcatchd(8) to use RDApplication.
This commit is contained in:
Fred Gleason 2018-02-04 06:23:54 -05:00
parent e305344e6b
commit f932a66cee
2 changed files with 2 additions and 7 deletions

View File

@ -2,7 +2,7 @@
// //
// Convert Audio File Formats // Convert Audio File Formats
// //
// (C) Copyright 2010-2017 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2010-2018 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
@ -53,13 +53,11 @@
#include <rdcart.h> #include <rdcart.h>
#include <rdconf.h> #include <rdconf.h>
#include <rd.h> #include <rd.h>
//#include <rdlibrary_conf.h>
#include <rdtempdirectory.h> #include <rdtempdirectory.h>
#define STAGE2_XFER_SIZE 2048 #define STAGE2_XFER_SIZE 2048
#define STAGE2_BUFFER_SIZE 49152 #define STAGE2_BUFFER_SIZE 49152
//RDAudioConvert::RDAudioConvert(const QString &station_name,QObject *parent)
RDAudioConvert::RDAudioConvert(QObject *parent) RDAudioConvert::RDAudioConvert(QObject *parent)
: QObject(parent) : QObject(parent)
{ {
@ -70,9 +68,7 @@ RDAudioConvert::RDAudioConvert(QObject *parent)
conv_settings=NULL; conv_settings=NULL;
conv_src_wavedata=new RDWaveData(); conv_src_wavedata=new RDWaveData();
conv_dst_wavedata=NULL; conv_dst_wavedata=NULL;
// RDLibraryConf *conf=new RDLibraryConf(station_name);
conv_src_converter=rda->libraryConf()->srcConverter(); conv_src_converter=rda->libraryConf()->srcConverter();
// delete conf;
// //
// Load MPEG Libraries // Load MPEG Libraries

View File

@ -2,7 +2,7 @@
// //
// Convert Audio File Formats // Convert Audio File Formats
// //
// (C) Copyright 2010-2017 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2010-2018 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
@ -48,7 +48,6 @@ class RDAudioConvert : public QObject
ErrorNoDestination=3,ErrorInvalidSource=4,ErrorInternal=5, ErrorNoDestination=3,ErrorInvalidSource=4,ErrorInternal=5,
ErrorFormatNotSupported=6,ErrorNoDisc=7,ErrorNoTrack=8, ErrorFormatNotSupported=6,ErrorNoDisc=7,ErrorNoTrack=8,
ErrorInvalidSpeed=9,ErrorFormatError=10,ErrorNoSpace=11}; ErrorInvalidSpeed=9,ErrorFormatError=10,ErrorNoSpace=11};
// RDAudioConvert(const QString &station_name,QObject *parent=0);
RDAudioConvert(QObject *parent=0); RDAudioConvert(QObject *parent=0);
~RDAudioConvert(); ~RDAudioConvert();
void setSourceFile(const QString &filename); void setSourceFile(const QString &filename);