smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-23 23:17:46 +01:00
Code Issues Projects Releases Wiki Activity

Use SystemExec for post-export hook

Browse source 
Use the new command-line parsing constructor for SystemExec to construct
the args array for the post-export hook from the entered command string,
with some simple substitutions for filename, directory, &c.

Conflicts:
	gtk2_ardour/export_format_dialog.cc
	libs/ardour/export_handler.cc
This commit is contained in:
Colin Fletcher 2013-10-10 19:54:22 +01:00 • committed by Paul Davis
parent ec99a4f5c2
commit c2bdb00b0c
2 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/export_handler.h
View file

@ -96,6 +96,8 @@ class LIBARDOUR_API ExportHandler : public ExportElementFactory, public sigc::tr
friend boost::shared_ptr<ExportHandler> Session::get_export_handler();
ExportHandler (Session & session);
void command_output(std::string output, size_t size);
public:
~ExportHandler ();

32
libs/ardour/export_handler.cc
View file

@ -38,8 +38,9 @@
#include "ardour/export_filename.h"
#include "ardour/session_metadata.h"
#include "ardour/soundcloud_upload.h"
#include "ardour/system_exec.h"
#include "ardour/session_metadata.h"
#include "pbd/openuri.h"
#include "pbd/basename.h"
#include "pbd/system_exec.h"
#include "i18n.h"
@ -283,6 +284,13 @@ ExportHandler::process_normalize ()
return 0;
}
void
ExportHandler::command_output(std::string output, size_t size)
{
std::cerr << "command: " << size << ", " << output << std::endl;
info << output << endmsg;
}
void
ExportHandler::finish_timespan ()
{
@ -307,9 +315,9 @@ ExportHandler::finish_timespan ()
#if 0 // would be nicer with C++11 initialiser...
std::map<char, std::string> subs {
{ 'f', filename },
{ 'd', Glib::path_get_dirname(filename) },
{ 'b', PBD::basename_nosuffix(filename) },
{ 'f', filepath },
{ 'd', Glib::path_get_dirname(filepath) },
{ 'b', PBD::basename_nosuffix(filepath) },
{ 'u', upload_username },
{ 'p', upload_password}
};
@ -317,15 +325,16 @@ ExportHandler::finish_timespan ()
PBD::ScopedConnection command_connection;
std::map<char, std::string> subs;
subs.insert (std::pair<char, std::string> ('f', filename));
subs.insert (std::pair<char, std::string> ('d', Glib::path_get_dirname(filename)));
subs.insert (std::pair<char, std::string> ('b', PBD::basename_nosuffix(filename)));
subs.insert (std::pair<char, std::string> ('u', soundcloud_username));
subs.insert (std::pair<char, std::string> ('p', soundcloud_password));
subs.insert (std::pair<char, std::string> ('f', filepath));
subs.insert (std::pair<char, std::string> ('d', Glib::path_get_dirname(filepath)));
subs.insert (std::pair<char, std::string> ('b', PBD::basename_nosuffix(filepath)));
subs.insert (std::pair<char, std::string> ('u', upload_username));
subs.insert (std::pair<char, std::string> ('p', upload_password));
std::cerr << "running command: " << fmt->command() << "..." << std::endl;
ARDOUR::SystemExec *se = new ARDOUR::SystemExec(fmt->command(), subs);
SystemExec *se = new SystemExec(fmt->command(), subs);
se->ReadStdout.connect_same_thread(command_connection, boost::bind(&ExportHandler::command_output, this, _1, _2));
if (se->start (2) == 0) {
// successfully started
@ -333,6 +342,7 @@ ExportHandler::finish_timespan ()
while (se->is_running ()) {
// wait for system exec to terminate
// std::cerr << "waiting..." << std::endl;
Glib::usleep (1000);
}
}