Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-04-24 23:13:37 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Refactored the RDAudioImport class to use RDApplication.
This commit is contained in:
Fred Gleason
2018-02-04 07:11:12 -05:00
parent 69817c1941
commit 957772c5e6
13 changed files with 73 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/rdaudioimport.cpp
View File

@@ -32,10 +32,11 @@
#include <qapplication.h>
#include <rd.h>
#include <rdxport_interface.h>
#include <rdformpost.h>
#include <rdapplication.h>
#include <rdaudioimport.h>
#include <rdformpost.h>
#include <rdwebresult.h>
#include <rdxport_interface.h>
//
// CURL Callbacks
@@ -62,12 +63,9 @@ int ImportProgressCallback(void *clientp,double dltotal,double dlnow,
}
RDAudioImport::RDAudioImport(RDStation *station,RDConfig *config,
QObject *parent)
RDAudioImport::RDAudioImport(QObject *parent)
: QObject(parent)
{
conv_station=station;
conv_config=config;
conv_cart_number=0;
conv_cut_number=0;
conv_settings=NULL;
@@ -170,7 +168,7 @@ RDAudioImport::ErrorCode RDAudioImport::runImport(const QString &username,
curl_easy_setopt(curl,CURLOPT_WRITEDATA,stdout);
curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
curl_easy_setopt(curl,CURLOPT_USERAGENT,
(const char *)conv_config->userAgent());
(const char *)rda->config()->userAgent());
curl_easy_setopt(curl,CURLOPT_TIMEOUT,RD_CURL_TIMEOUT);
curl_easy_setopt(curl,CURLOPT_PROGRESSFUNCTION,ImportProgressCallback);
curl_easy_setopt(curl,CURLOPT_PROGRESSDATA,this);
@@ -182,7 +180,7 @@ RDAudioImport::ErrorCode RDAudioImport::runImport(const QString &username,
// otherwise some versions of LibCurl will throw a 'bad/illegal format'
// error.
//
strncpy(url,conv_station->webServiceUrl(conv_config),1024);
strncpy(url,rda->station()->webServiceUrl(rda->config()),1024);
curl_easy_setopt(curl,CURLOPT_URL,url);
//