ardour/livetrax
13
0
Fork 0
Code

Create Freesound working directory a little more lazily so

Browse Source 
that a Freesound directory doesn't appear in /home/carl
without ever using Freesound.


git-svn-id: svn://localhost/ardour2/branches/3.0@11090 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-12-27 14:36:14 +00:00
parent 3239706d40
commit e41d64724c
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2_ardour/sfdb_freesound_mootcher.cc
View File

@ -41,6 +41,7 @@
#include "sfdb_freesound_mootcher.h" #include "sfdb_freesound_mootcher.h"
#include "pbd/xml++.h" #include "pbd/xml++.h"
#include "pbd/filesystem.h"
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@ -64,7 +65,7 @@ Mootcher:: ~Mootcher()
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
const char* Mootcher::changeWorkingDir(const char *saveLocation) void Mootcher::changeWorkingDir(const char *saveLocation)
{ {
basePath = saveLocation; basePath = saveLocation;
#ifdef __WIN32__ #ifdef __WIN32__
@ -78,16 +79,18 @@ const char* Mootcher::changeWorkingDir(const char *saveLocation)
// //
size_t pos2 = basePath.find_last_of("/"); size_t pos2 = basePath.find_last_of("/");
if(basePath.length() != (pos2+1)) basePath += "/"; if(basePath.length() != (pos2+1)) basePath += "/";
// create Freesound directory and sound dir
std::string sndLocation = basePath;
mkdir(sndLocation.c_str(), 0777);
sndLocation += "snd";
mkdir(sndLocation.c_str(), 0777);
return basePath.c_str();
} }
void Mootcher::ensureWorkingDir ()
{
PBD::sys::path p = basePath;
p /= "snd";
if (!PBD::sys::is_directory (p)) {
PBD::sys::create_directories (p);
}
}
//------------------------------------------------------------------------ //------------------------------------------------------------------------
size_t Mootcher::WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) size_t Mootcher::WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
{ {
@ -259,6 +262,7 @@ std::string Mootcher::getSoundResourceFile(std::string ID)
// std::cerr << "getSoundResourceFile: saving XML: " << xmlFileName << std::endl; // std::cerr << "getSoundResourceFile: saving XML: " << xmlFileName << std::endl;
// save the xml file to disk // save the xml file to disk
ensureWorkingDir();
doc.write(xmlFileName.c_str()); doc.write(xmlFileName.c_str());
//store all the tags in the database //store all the tags in the database
@ -293,7 +297,7 @@ int audioFileWrite(void *buffer, size_t size, size_t nmemb, void *file)
//------------------------------------------------------------------------ //------------------------------------------------------------------------
std::string Mootcher::getAudioFile(std::string originalFileName, std::string ID, std::string audioURL, Gtk::ProgressBar *progress_bar) std::string Mootcher::getAudioFile(std::string originalFileName, std::string ID, std::string audioURL, Gtk::ProgressBar *progress_bar)
{ {
ensureWorkingDir();
std::string audioFileName = basePath + "snd/" + ID + "-" + originalFileName; std::string audioFileName = basePath + "snd/" + ID + "-" + originalFileName;
//check to see if audio file already exists //check to see if audio file already exists

3
gtk2_ardour/sfdb_freesound_mootcher.h
View File

@ -55,7 +55,8 @@ public:
private: private:
const char* changeWorkingDir(const char *saveLocation); void changeWorkingDir(const char *saveLocation);
void ensureWorkingDir();
std::string doRequest(std::string uri, std::string params); std::string doRequest(std::string uri, std::string params);
void setcUrlOptions(); void setcUrlOptions();