2017-12-15 Fred Gleason <fredg@paravelsystems.com>

* Removed the 'RDTempDir()' function.
This commit is contained in:
Fred Gleason
2017-12-15 07:47:41 -05:00
parent 5b75716f4a
commit 3b1ce13e77
20 changed files with 154 additions and 165 deletions

View File

@@ -2,7 +2,7 @@
//
// Replicator implementation for the Citadel XDS Portal
//
// (C) Copyright 2010,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010,2016-2017 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
@@ -26,15 +26,16 @@
#include <qfileinfo.h>
#include <qdatetime.h>
#include <rddb.h>
#include <rdconf.h>
#include <rdaudioconvert.h>
#include <rdupload.h>
#include <rdcut.h>
#include <rdcart.h>
#include <rdcut.h>
#include <rdconf.h>
#include <rddb.h>
#include <rddelete.h>
#include <rdescape_string.h>
#include <rdstringlist.h>
#include <rddelete.h>
#include <rdtempdirectory.h>
#include <rdupload.h>
#include <citadelxds.h>
@@ -345,7 +346,7 @@ bool CitadelXds::PostCut(const QString &cutname,const QString &filename)
speed_ratio=(float)cut->length()/(float)cart->forcedLength();
}
RDSettings *settings=new RDSettings();
QString tempfile=RDTempDir()+"/"+filename;
QString tempfile=RDTempDirectory::basePath()+"/"+filename;
RDAudioConvert *conv=new RDAudioConvert(rdconfig->stationName());
conv->setSourceFile(RDCut::pathName(cutname));
conv->setDestinationFile(tempfile);

View File

@@ -2,7 +2,7 @@
//
// The Rivendell Replicator Daemon
//
// (C) Copyright 2010,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010,2016-2017 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
@@ -24,12 +24,13 @@
#include <qapplication.h>
#include <rddb.h>
#include <dbversion.h>
#include <rdcart.h>
#include <rdconf.h>
#include <rdcmd_switch.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rdcart.h>
#include <dbversion.h>
#include <rdtempdirectory.h>
#include <globals.h>
#include <citadelxds.h>
@@ -100,7 +101,7 @@ MainObject::MainObject(QObject *parent)
//
// Calculate Temporary Directory
//
repl_temp_dir=RDTempDir();
repl_temp_dir=RDTempDirectory::basePath();
//
// Open Database