use g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several files
This commit is contained in:
parent
f9549b6c5c
commit
15be154515
|
@ -25,6 +25,8 @@
|
|||
|
||||
#include <gtkmm/messagedialog.h>
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include "gtkmm2ext/choice.h"
|
||||
|
||||
#include "pbd/pthread_utils.h"
|
||||
|
@ -158,11 +160,11 @@ Editor::export_region ()
|
|||
|
||||
switch (ret) {
|
||||
case Gtk::RESPONSE_ACCEPT:
|
||||
/* force unlink because the backend code will
|
||||
/* force ::g_unlink because the backend code will
|
||||
go wrong if it tries to open an existing
|
||||
file for writing.
|
||||
*/
|
||||
::unlink (path.c_str());
|
||||
::g_unlink (path.c_str());
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
#include <jack/types.h>
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include "ardour/profile.h"
|
||||
#include "ardour/rc_configuration.h"
|
||||
#include "ardour/audio_track.h"
|
||||
|
@ -118,7 +120,7 @@ Editor::embed_audio_from_video (std::string path, framepos_t n)
|
|||
|
||||
import_status.all_done = true;
|
||||
#endif
|
||||
unlink(path.c_str());
|
||||
::g_unlink(path.c_str());
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
#include <sigc++/bind.h>
|
||||
#include <libgen.h>
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include "pbd/error.h"
|
||||
#include "pbd/convert.h"
|
||||
#include "gtkmm2ext/utils.h"
|
||||
|
@ -405,8 +407,8 @@ void
|
|||
ExportVideoDialog::finished ()
|
||||
{
|
||||
if (aborted) {
|
||||
unlink(outfn_path_entry.get_text().c_str());
|
||||
unlink (insnd.c_str());
|
||||
::g_unlink(outfn_path_entry.get_text().c_str());
|
||||
::g_unlink (insnd.c_str());
|
||||
Gtk::Dialog::response(RESPONSE_CANCEL);
|
||||
} else if (twopass && firstpass) {
|
||||
firstpass = false;
|
||||
|
@ -416,9 +418,9 @@ ExportVideoDialog::finished ()
|
|||
if (twopass_checkbox.get_active()) {
|
||||
std::string outfn = outfn_path_entry.get_text();
|
||||
std::string p2log = Glib::path_get_dirname (outfn) + G_DIR_SEPARATOR + "ffmpeg2pass";
|
||||
unlink (p2log.c_str());
|
||||
::g_unlink (p2log.c_str());
|
||||
}
|
||||
unlink (insnd.c_str());
|
||||
::g_unlink (insnd.c_str());
|
||||
Gtk::Dialog::response(RESPONSE_ACCEPT);
|
||||
}
|
||||
}
|
||||
|
@ -554,7 +556,7 @@ ExportVideoDialog::launch_export ()
|
|||
audio_progress_connection.disconnect();
|
||||
status->finish ();
|
||||
if (status->aborted()) {
|
||||
unlink (insnd.c_str());
|
||||
::g_unlink (insnd.c_str());
|
||||
Gtk::Dialog::response(RESPONSE_CANCEL);
|
||||
return;
|
||||
}
|
||||
|
@ -571,14 +573,14 @@ ExportVideoDialog::encode_pass (int pass)
|
|||
transcoder = new TranscodeFfmpeg(invid);
|
||||
if (!transcoder->ffexec_ok()) {
|
||||
/* ffmpeg binary was not found. TranscodeFfmpeg prints a warning */
|
||||
unlink (insnd.c_str());
|
||||
::g_unlink (insnd.c_str());
|
||||
Gtk::Dialog::response(RESPONSE_CANCEL);
|
||||
return;
|
||||
}
|
||||
if (!transcoder->probe_ok()) {
|
||||
/* video input file can not be read */
|
||||
warning << _("Export Video: Video input file cannot be read.") << endmsg;
|
||||
unlink (insnd.c_str());
|
||||
::g_unlink (insnd.c_str());
|
||||
Gtk::Dialog::response(RESPONSE_CANCEL);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -31,6 +31,8 @@
|
|||
|
||||
#include <gtkmm/box.h>
|
||||
#include <gtkmm/stock.h>
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
#include <glibmm/fileutils.h>
|
||||
|
||||
#include "pbd/convert.h"
|
||||
|
@ -1487,7 +1489,7 @@ SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths
|
|||
goto out;
|
||||
}
|
||||
|
||||
unlink (tmpc);
|
||||
::g_unlink (tmpc);
|
||||
}
|
||||
|
||||
ret = true;
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
#include <sigc++/bind.h>
|
||||
#include <libgen.h>
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include "pbd/error.h"
|
||||
#include "pbd/convert.h"
|
||||
#include "gtkmm2ext/utils.h"
|
||||
|
@ -301,9 +303,9 @@ void
|
|||
TranscodeVideoDialog::finished ()
|
||||
{
|
||||
if (aborted) {
|
||||
unlink(path_entry.get_text().c_str());
|
||||
::g_unlink(path_entry.get_text().c_str());
|
||||
if (!audiofile.empty()) {
|
||||
unlink(audiofile.c_str());
|
||||
::g_unlink(audiofile.c_str());
|
||||
}
|
||||
Gtk::Dialog::response(RESPONSE_CANCEL);
|
||||
} else {
|
||||
|
|
|
@ -2452,7 +2452,7 @@ AUPluginInfo::save_cached_info ()
|
|||
|
||||
if (!tree.write (path)) {
|
||||
error << string_compose (_("could not save AU cache to %1"), path) << endmsg;
|
||||
unlink (path.c_str());
|
||||
::g_unlink (path.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
|
||||
#include <sndfile.h>
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
#include <glibmm/miscutils.h>
|
||||
#include <glibmm/fileutils.h>
|
||||
#include <glibmm/threads.h>
|
||||
|
@ -133,8 +134,8 @@ AudioFileSource::~AudioFileSource ()
|
|||
{
|
||||
DEBUG_TRACE (DEBUG::Destruction, string_compose ("AudioFileSource destructor %1, removable? %2\n", _path, removable()));
|
||||
if (removable()) {
|
||||
unlink (_path.c_str());
|
||||
unlink (peakpath.c_str());
|
||||
::g_unlink (_path.c_str());
|
||||
::g_unlink (peakpath.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -292,7 +293,7 @@ AudioFileSource::mark_streaming_write_completed ()
|
|||
int
|
||||
AudioFileSource::move_dependents_to_trash()
|
||||
{
|
||||
return ::unlink (peakpath.c_str());
|
||||
return ::g_unlink (peakpath.c_str());
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -653,7 +653,7 @@ AudioSource::build_peaks_from_scratch ()
|
|||
out:
|
||||
if (ret) {
|
||||
DEBUG_TRACE (DEBUG::Peaks, string_compose("Could not write peak data, attempting to remove peakfile %1\n", peakpath));
|
||||
unlink (peakpath.c_str());
|
||||
::g_unlink (peakpath.c_str());
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
#include "ardour/export_handler.h"
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
#include <glibmm.h>
|
||||
#include <glibmm/convert.h>
|
||||
|
||||
|
@ -415,10 +416,10 @@ ExportHandler::export_cd_marker_file (ExportTimespanPtr timespan, ExportFormatSp
|
|||
|
||||
} catch (std::exception& e) {
|
||||
error << string_compose (_("an error occured while writing a TOC/CUE file: %1"), e.what()) << endmsg;
|
||||
::unlink (filepath.c_str());
|
||||
::g_unlink (filepath.c_str());
|
||||
} catch (Glib::Exception& e) {
|
||||
error << string_compose (_("an error occured while writing a TOC/CUE file: %1"), e.what()) << endmsg;
|
||||
::unlink (filepath.c_str());
|
||||
::g_unlink (filepath.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
#include <sndfile.h>
|
||||
#include <samplerate.h>
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
#include <glibmm.h>
|
||||
|
||||
#include <boost/scoped_array.hpp>
|
||||
|
@ -464,7 +465,7 @@ remove_file_source (boost::shared_ptr<Source> source)
|
|||
boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (source);
|
||||
|
||||
if (fs) {
|
||||
::unlink (fs->path().c_str());
|
||||
::g_unlink (fs->path().c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
#include <giomm/file.h>
|
||||
#include <glib/gprintf.h>
|
||||
#include <glibmm.h>
|
||||
|
@ -1085,7 +1086,7 @@ LV2Plugin::do_remove_preset(string name)
|
|||
name + ".ttl"
|
||||
)
|
||||
);
|
||||
unlink(preset_file.c_str());
|
||||
::g_unlink(preset_file.c_str());
|
||||
}
|
||||
|
||||
bool
|
||||
|
|
|
@ -2900,7 +2900,7 @@ Session::cleanup_sources (CleanupReport& rep)
|
|||
string peakpath = peak_path (base);
|
||||
|
||||
if (Glib::file_test (peakpath.c_str(), Glib::FILE_TEST_EXISTS)) {
|
||||
if (::unlink (peakpath.c_str()) != 0) {
|
||||
if (::g_unlink (peakpath.c_str()) != 0) {
|
||||
error << string_compose (_("cannot remove peakfile %1 for %2 (%3)"),
|
||||
peakpath, _path, strerror (errno))
|
||||
<< endmsg;
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include "pbd/stl_delete.h"
|
||||
#include "pbd/strsplit.h"
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
#include <glibmm/miscutils.h>
|
||||
|
||||
#include "evoral/Control.hpp"
|
||||
|
@ -96,7 +97,7 @@ SMFSource::SMFSource (Session& s, const XMLNode& node, bool must_exist)
|
|||
SMFSource::~SMFSource ()
|
||||
{
|
||||
if (removable()) {
|
||||
unlink (_path.c_str());
|
||||
::g_unlink (_path.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
|
||||
#include <iostream>
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include "pbd/xml++.h"
|
||||
#include "pbd/convert.h"
|
||||
|
||||
|
@ -389,7 +391,7 @@ Bindings::save (const string& path)
|
|||
save (*root);
|
||||
|
||||
if (!tree.write (path)) {
|
||||
::unlink (path.c_str());
|
||||
::g_unlink (path.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -25,6 +25,8 @@
|
|||
#include <unistd.h>
|
||||
#include <stdio.h> /* for snprintf, grrr */
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <gtkmm.h>
|
||||
|
||||
|
@ -516,15 +518,15 @@ MotionFeedback::render_pixbuf (int size)
|
|||
pixbuf = Gdk::Pixbuf::create_from_file (path);
|
||||
} catch (const Gdk::PixbufError &e) {
|
||||
std::cerr << "Caught PixbufError: " << e.what() << std::endl;
|
||||
unlink (path);
|
||||
::g_unlink (path);
|
||||
throw;
|
||||
} catch (...) {
|
||||
unlink (path);
|
||||
::g_unlink (path);
|
||||
g_message("Caught ... ");
|
||||
throw;
|
||||
}
|
||||
|
||||
unlink (path);
|
||||
::g_unlink (path);
|
||||
|
||||
g_free(path);
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
#include <glibmm/miscutils.h>
|
||||
|
||||
#include "pbd/error.h"
|
||||
|
@ -66,7 +67,7 @@ PBD::clear_directory (const string& dir, size_t* size, vector<string>* paths)
|
|||
continue;
|
||||
}
|
||||
|
||||
if (::unlink (fullpath.c_str())) {
|
||||
if (::g_unlink (fullpath.c_str())) {
|
||||
error << string_compose (_("cannot remove file %1 (%2)"), fullpath, strerror (errno))
|
||||
<< endmsg;
|
||||
ret = 1;
|
||||
|
|
|
@ -445,7 +445,7 @@ static void usb_tranzport_interrupt_out_callback(struct urb *urb)
|
|||
{
|
||||
struct usb_tranzport *dev = urb->context;
|
||||
|
||||
/* sync/async unlink faults aren't errors */
|
||||
/* sync/async ::g_unlink faults aren't errors */
|
||||
if (urb->status && !(urb->status == -ENOENT ||
|
||||
urb->status == -ECONNRESET ||
|
||||
urb->status == -ESHUTDOWN))
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include <glib/gstdio.h>
|
||||
#include <glibmm/miscutils.h>
|
||||
|
||||
#include <pbd/pthread_utils.h>
|
||||
|
@ -181,7 +182,7 @@ OSC::start ()
|
|||
int fd = mkstemp(tmpstr);
|
||||
|
||||
if (fd >= 0 ) {
|
||||
unlink (tmpstr);
|
||||
::g_unlink (tmpstr);
|
||||
close (fd);
|
||||
|
||||
_osc_unix_server = lo_server_new (tmpstr, error_callback);
|
||||
|
@ -284,11 +285,11 @@ OSC::stop ()
|
|||
}
|
||||
|
||||
if (!_osc_unix_socket_path.empty()) {
|
||||
unlink (_osc_unix_socket_path.c_str());
|
||||
::g_unlink (_osc_unix_socket_path.c_str());
|
||||
}
|
||||
|
||||
if (!_osc_url_file.empty() ) {
|
||||
unlink (_osc_url_file.c_str() );
|
||||
::g_unlink (_osc_url_file.c_str() );
|
||||
}
|
||||
|
||||
// Delete any active route observers
|
||||
|
|
Loading…
Reference in New Issue