21 |
#include <cstring> |
#include <cstring> |
22 |
|
|
23 |
#include "compat.h" |
#include "compat.h" |
|
// threads.h must be included first to be able to build with |
|
|
// G_DISABLE_DEPRECATED |
|
|
#if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION == 31 && GLIBMM_MICRO_VERSION >= 2) || \ |
|
|
(GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION > 31) || GLIBMM_MAJOR_VERSION > 2 |
|
|
#include <glibmm/threads.h> |
|
|
#endif |
|
24 |
|
|
25 |
#include <glibmm/convert.h> |
#include <glibmm/convert.h> |
26 |
#include <glibmm/dispatcher.h> |
#include <glibmm/dispatcher.h> |
96 |
|
|
97 |
if (!Settings::singleton()->autoRestoreWindowDimension) { |
if (!Settings::singleton()->autoRestoreWindowDimension) { |
98 |
#if GTKMM_MAJOR_VERSION >= 3 |
#if GTKMM_MAJOR_VERSION >= 3 |
99 |
set_default_size(895, 600); |
set_default_size(960, 600); |
100 |
#else |
#else |
101 |
set_default_size(800, 600); |
set_default_size(865, 600); |
102 |
#endif |
#endif |
103 |
set_position(Gtk::WIN_POS_CENTER); |
set_position(Gtk::WIN_POS_CENTER); |
104 |
} |
} |
1886 |
} |
} |
1887 |
} |
} |
1888 |
|
|
1889 |
|
|
1890 |
|
LoaderSaverBase::LoaderSaverBase(const Glib::ustring filename, gig::File* gig) : |
1891 |
|
filename(filename), gig(gig), |
1892 |
|
#ifdef GLIB_THREADS |
1893 |
|
thread(0), |
1894 |
|
#endif |
1895 |
|
progress(0.f) |
1896 |
|
{ |
1897 |
|
} |
1898 |
|
|
1899 |
void loader_progress_callback(gig::progress_t* progress) |
void loader_progress_callback(gig::progress_t* progress) |
1900 |
{ |
{ |
1901 |
Loader* loader = static_cast<Loader*>(progress->custom); |
LoaderSaverBase* loader = static_cast<LoaderSaverBase*>(progress->custom); |
1902 |
loader->progress_callback(progress->factor); |
loader->progress_callback(progress->factor); |
1903 |
} |
} |
1904 |
|
|
1905 |
void Loader::progress_callback(float fraction) |
void LoaderSaverBase::progress_callback(float fraction) |
1906 |
{ |
{ |
1907 |
{ |
{ |
1908 |
|
#ifdef GLIB_THREADS |
1909 |
Glib::Threads::Mutex::Lock lock(progressMutex); |
Glib::Threads::Mutex::Lock lock(progressMutex); |
1910 |
|
#else |
1911 |
|
std::lock_guard<std::mutex> lock(progressMutex); |
1912 |
|
#endif |
1913 |
progress = fraction; |
progress = fraction; |
1914 |
} |
} |
1915 |
progress_dispatcher(); |
progress_dispatcher(); |
1919 |
// make sure stack is 16-byte aligned for SSE instructions |
// make sure stack is 16-byte aligned for SSE instructions |
1920 |
__attribute__((force_align_arg_pointer)) |
__attribute__((force_align_arg_pointer)) |
1921 |
#endif |
#endif |
1922 |
void Loader::thread_function() |
void LoaderSaverBase::thread_function() |
1923 |
{ |
{ |
1924 |
|
#ifdef GLIB_THREADS |
1925 |
printf("thread_function self=%p\n", |
printf("thread_function self=%p\n", |
1926 |
static_cast<void*>(Glib::Threads::Thread::self())); |
static_cast<void*>(Glib::Threads::Thread::self())); |
1927 |
|
#else |
1928 |
|
std::cout << "thread_function self=" << std::this_thread::get_id() << "\n"; |
1929 |
|
#endif |
1930 |
printf("Start %s\n", filename.c_str()); |
printf("Start %s\n", filename.c_str()); |
1931 |
try { |
try { |
|
RIFF::File* riff = new RIFF::File(filename); |
|
|
gig = new gig::File(riff); |
|
1932 |
gig::progress_t progress; |
gig::progress_t progress; |
1933 |
progress.callback = loader_progress_callback; |
progress.callback = loader_progress_callback; |
1934 |
progress.custom = this; |
progress.custom = this; |
1935 |
|
|
1936 |
gig->GetInstrument(0, &progress); |
thread_function_sub(progress); |
1937 |
printf("End\n"); |
printf("End\n"); |
1938 |
finished_dispatcher(); |
finished_dispatcher(); |
1939 |
} catch (RIFF::Exception e) { |
} catch (RIFF::Exception e) { |
1945 |
} |
} |
1946 |
} |
} |
1947 |
|
|
1948 |
Loader::Loader(const char* filename) |
void LoaderSaverBase::launch() |
|
: filename(filename), gig(0), thread(0), progress(0.f) |
|
|
{ |
|
|
} |
|
|
|
|
|
void Loader::launch() |
|
1949 |
{ |
{ |
1950 |
|
#ifdef GLIB_THREADS |
1951 |
#ifdef OLD_THREADS |
#ifdef OLD_THREADS |
1952 |
thread = Glib::Thread::create(sigc::mem_fun(*this, &Loader::thread_function), true); |
thread = Glib::Thread::create(sigc::mem_fun(*this, &LoaderSaverBase::thread_function), true); |
1953 |
#else |
#else |
1954 |
thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function)); |
thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &LoaderSaverBase::thread_function)); |
1955 |
#endif |
#endif |
1956 |
printf("launch thread=%p\n", static_cast<void*>(thread)); |
printf("launch thread=%p\n", static_cast<void*>(thread)); |
1957 |
|
#else |
1958 |
|
thread = std::thread([this](){ thread_function(); }); |
1959 |
|
std::cout << "launch thread=" << thread.get_id() << "\n"; |
1960 |
|
#endif |
1961 |
} |
} |
1962 |
|
|
1963 |
float Loader::get_progress() |
float LoaderSaverBase::get_progress() |
1964 |
{ |
{ |
1965 |
float res; |
#ifdef GLIB_THREADS |
1966 |
{ |
Glib::Threads::Mutex::Lock lock(progressMutex); |
1967 |
Glib::Threads::Mutex::Lock lock(progressMutex); |
#else |
1968 |
res = progress; |
std::lock_guard<std::mutex> lock(progressMutex); |
1969 |
} |
#endif |
1970 |
return res; |
return progress; |
1971 |
} |
} |
1972 |
|
|
1973 |
Glib::Dispatcher& Loader::signal_progress() |
Glib::Dispatcher& LoaderSaverBase::signal_progress() |
1974 |
{ |
{ |
1975 |
return progress_dispatcher; |
return progress_dispatcher; |
1976 |
} |
} |
1977 |
|
|
1978 |
Glib::Dispatcher& Loader::signal_finished() |
Glib::Dispatcher& LoaderSaverBase::signal_finished() |
1979 |
{ |
{ |
1980 |
return finished_dispatcher; |
return finished_dispatcher; |
1981 |
} |
} |
1982 |
|
|
1983 |
Glib::Dispatcher& Loader::signal_error() |
Glib::Dispatcher& LoaderSaverBase::signal_error() |
1984 |
{ |
{ |
1985 |
return error_dispatcher; |
return error_dispatcher; |
1986 |
} |
} |
1987 |
|
|
1988 |
void saver_progress_callback(gig::progress_t* progress) |
void LoaderSaverBase::join() { |
1989 |
{ |
#ifdef GLIB_THREADS |
1990 |
Saver* saver = static_cast<Saver*>(progress->custom); |
thread->join(); |
1991 |
saver->progress_callback(progress->factor); |
#else |
1992 |
|
thread.join(); |
1993 |
|
#endif |
1994 |
} |
} |
1995 |
|
|
1996 |
void Saver::progress_callback(float fraction) |
|
1997 |
|
Loader::Loader(const char* filename) : |
1998 |
|
LoaderSaverBase(filename, 0) |
1999 |
{ |
{ |
|
{ |
|
|
Glib::Threads::Mutex::Lock lock(progressMutex); |
|
|
progress = fraction; |
|
|
} |
|
|
progress_dispatcher.emit(); |
|
2000 |
} |
} |
2001 |
|
|
2002 |
#if defined(WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) |
void Loader::thread_function_sub(gig::progress_t& progress) |
|
// make sure stack is 16-byte aligned for SSE instructions |
|
|
__attribute__((force_align_arg_pointer)) |
|
|
#endif |
|
|
void Saver::thread_function() |
|
2003 |
{ |
{ |
2004 |
printf("thread_function self=%p\n", |
RIFF::File* riff = new RIFF::File(filename); |
2005 |
static_cast<void*>(Glib::Threads::Thread::self())); |
gig = new gig::File(riff); |
|
printf("Start %s\n", filename.c_str()); |
|
|
try { |
|
|
gig::progress_t progress; |
|
|
progress.callback = saver_progress_callback; |
|
|
progress.custom = this; |
|
|
|
|
|
// if no filename was provided, that means "save", if filename was provided means "save as" |
|
|
if (filename.empty()) { |
|
|
if (!Settings::singleton()->saveWithTemporaryFile) { |
|
|
// save directly over the existing .gig file |
|
|
// (requires less disk space than solution below |
|
|
// but may be slower) |
|
|
gig->Save(&progress); |
|
|
} else { |
|
|
// save the file as separate temporary file first, |
|
|
// then move the saved file over the old file |
|
|
// (may result in performance speedup during save) |
|
|
gig::String tmpname = filename + ".TMP"; |
|
|
gig->Save(tmpname, &progress); |
|
|
#if defined(WIN32) |
|
|
if (!DeleteFile(filename.c_str())) { |
|
|
throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file)."); |
|
|
} |
|
|
#else // POSIX ... |
|
|
if (unlink(filename.c_str())) { |
|
|
throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file): " + gig::String(strerror(errno))); |
|
|
} |
|
|
#endif |
|
|
if (rename(tmpname.c_str(), filename.c_str())) { |
|
|
#if defined(WIN32) |
|
|
throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file)."); |
|
|
#else |
|
|
throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file): " + gig::String(strerror(errno))); |
|
|
#endif |
|
|
} |
|
|
} |
|
|
} else { |
|
|
gig->Save(filename, &progress); |
|
|
} |
|
2006 |
|
|
2007 |
printf("End\n"); |
gig->GetInstrument(0, &progress); |
|
finished_dispatcher.emit(); |
|
|
} catch (RIFF::Exception e) { |
|
|
error_message = e.Message; |
|
|
error_dispatcher.emit(); |
|
|
} catch (...) { |
|
|
error_message = _("Unknown exception occurred"); |
|
|
error_dispatcher.emit(); |
|
|
} |
|
2008 |
} |
} |
2009 |
|
|
2010 |
Saver::Saver(gig::File* file, Glib::ustring filename) |
|
2011 |
: gig(file), filename(filename), thread(0), progress(0.f) |
Saver::Saver(gig::File* file, Glib::ustring filename) : |
2012 |
|
LoaderSaverBase(filename, file) |
2013 |
{ |
{ |
2014 |
} |
} |
2015 |
|
|
2016 |
void Saver::launch() |
void Saver::thread_function_sub(gig::progress_t& progress) |
2017 |
{ |
{ |
2018 |
#ifdef OLD_THREADS |
// if no filename was provided, that means "save", if filename was provided means "save as" |
2019 |
thread = Glib::Thread::create(sigc::mem_fun(*this, &Saver::thread_function), true); |
if (filename.empty()) { |
2020 |
|
if (!Settings::singleton()->saveWithTemporaryFile) { |
2021 |
|
// save directly over the existing .gig file |
2022 |
|
// (requires less disk space than solution below |
2023 |
|
// but may be slower) |
2024 |
|
gig->Save(&progress); |
2025 |
|
} else { |
2026 |
|
// save the file as separate temporary file first, |
2027 |
|
// then move the saved file over the old file |
2028 |
|
// (may result in performance speedup during save) |
2029 |
|
gig::String tmpname = filename + ".TMP"; |
2030 |
|
gig->Save(tmpname, &progress); |
2031 |
|
#if defined(WIN32) |
2032 |
|
if (!DeleteFile(filename.c_str())) { |
2033 |
|
throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file)."); |
2034 |
|
} |
2035 |
|
#else // POSIX ... |
2036 |
|
if (unlink(filename.c_str())) { |
2037 |
|
throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file): " + gig::String(strerror(errno))); |
2038 |
|
} |
2039 |
|
#endif |
2040 |
|
if (rename(tmpname.c_str(), filename.c_str())) { |
2041 |
|
#if defined(WIN32) |
2042 |
|
throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file)."); |
2043 |
#else |
#else |
2044 |
thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function)); |
throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file): " + gig::String(strerror(errno))); |
2045 |
#endif |
#endif |
2046 |
printf("launch thread=%p\n", static_cast<void*>(thread)); |
} |
2047 |
} |
} |
2048 |
|
} else { |
2049 |
float Saver::get_progress() |
gig->Save(filename, &progress); |
|
{ |
|
|
float res; |
|
|
{ |
|
|
Glib::Threads::Mutex::Lock lock(progressMutex); |
|
|
res = progress; |
|
2050 |
} |
} |
|
return res; |
|
2051 |
} |
} |
2052 |
|
|
|
Glib::Dispatcher& Saver::signal_progress() |
|
|
{ |
|
|
return progress_dispatcher; |
|
|
} |
|
|
|
|
|
Glib::Dispatcher& Saver::signal_finished() |
|
|
{ |
|
|
return finished_dispatcher; |
|
|
} |
|
|
|
|
|
Glib::Dispatcher& Saver::signal_error() |
|
|
{ |
|
|
return error_dispatcher; |
|
|
} |
|
2053 |
|
|
2054 |
ProgressDialog::ProgressDialog(const Glib::ustring& title, Gtk::Window& parent) |
ProgressDialog::ProgressDialog(const Glib::ustring& title, Gtk::Window& parent) |
2055 |
: Gtk::Dialog(title, parent, true) |
: Gtk::Dialog(title, parent, true) |
2205 |
dialog.set_current_folder(current_gig_dir); |
dialog.set_current_folder(current_gig_dir); |
2206 |
} |
} |
2207 |
if (dialog.run() == Gtk::RESPONSE_OK) { |
if (dialog.run() == Gtk::RESPONSE_OK) { |
2208 |
|
dialog.hide(); |
2209 |
std::string filename = dialog.get_filename(); |
std::string filename = dialog.get_filename(); |
2210 |
printf("filename=%s\n", filename.c_str()); |
printf("filename=%s\n", filename.c_str()); |
2211 |
|
#ifdef GLIB_THREADS |
2212 |
printf("on_action_file_open self=%p\n", |
printf("on_action_file_open self=%p\n", |
2213 |
static_cast<void*>(Glib::Threads::Thread::self())); |
static_cast<void*>(Glib::Threads::Thread::self())); |
2214 |
|
#else |
2215 |
|
std::cout << "on_action_file_open self=" << |
2216 |
|
std::this_thread::get_id() << "\n"; |
2217 |
|
#endif |
2218 |
load_file(filename.c_str()); |
load_file(filename.c_str()); |
2219 |
current_gig_dir = Glib::path_get_dirname(filename); |
current_gig_dir = Glib::path_get_dirname(filename); |
2220 |
} |
} |
2287 |
|
|
2288 |
void MainWindow::on_loader_finished() |
void MainWindow::on_loader_finished() |
2289 |
{ |
{ |
2290 |
|
loader->join(); |
2291 |
printf("Loader finished!\n"); |
printf("Loader finished!\n"); |
2292 |
|
#ifdef GLIB_THREADS |
2293 |
printf("on_loader_finished self=%p\n", |
printf("on_loader_finished self=%p\n", |
2294 |
static_cast<void*>(Glib::Threads::Thread::self())); |
static_cast<void*>(Glib::Threads::Thread::self())); |
2295 |
|
#else |
2296 |
|
std::cout << "on_loader_finished self=" << |
2297 |
|
std::this_thread::get_id() << "\n"; |
2298 |
|
#endif |
2299 |
load_gig(loader->gig, loader->filename.c_str()); |
load_gig(loader->gig, loader->filename.c_str()); |
2300 |
progress_dialog->hide(); |
progress_dialog->hide(); |
2301 |
} |
} |
2302 |
|
|
2303 |
void MainWindow::on_loader_error() |
void MainWindow::on_loader_error() |
2304 |
{ |
{ |
2305 |
|
loader->join(); |
2306 |
Glib::ustring txt = _("Could not load file: ") + loader->error_message; |
Glib::ustring txt = _("Could not load file: ") + loader->error_message; |
2307 |
Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR); |
Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR); |
2308 |
msg.run(); |
msg.run(); |
2373 |
|
|
2374 |
void MainWindow::on_saver_error() |
void MainWindow::on_saver_error() |
2375 |
{ |
{ |
2376 |
|
saver->join(); |
2377 |
file_structure_changed_signal.emit(this->file); |
file_structure_changed_signal.emit(this->file); |
2378 |
Glib::ustring txt = _("Could not save file: ") + saver->error_message; |
Glib::ustring txt = _("Could not save file: ") + saver->error_message; |
2379 |
Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR); |
Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR); |
2382 |
|
|
2383 |
void MainWindow::on_saver_finished() |
void MainWindow::on_saver_finished() |
2384 |
{ |
{ |
2385 |
|
saver->join(); |
2386 |
this->file = saver->gig; |
this->file = saver->gig; |
2387 |
this->filename = saver->filename; |
this->filename = saver->filename; |
2388 |
current_gig_dir = Glib::path_get_dirname(filename); |
current_gig_dir = Glib::path_get_dirname(filename); |
2474 |
#endif |
#endif |
2475 |
|
|
2476 |
if (dialog.run() == Gtk::RESPONSE_OK) { |
if (dialog.run() == Gtk::RESPONSE_OK) { |
2477 |
|
dialog.hide(); |
2478 |
std::string filename = dialog.get_filename(); |
std::string filename = dialog.get_filename(); |
2479 |
if (!Glib::str_has_suffix(filename, ".gig")) { |
if (!Glib::str_has_suffix(filename, ".gig")) { |
2480 |
filename += ".gig"; |
filename += ".gig"; |
2666 |
"backup your Gigasampler/GigaStudio files before editing them with " |
"backup your Gigasampler/GigaStudio files before editing them with " |
2667 |
"this application.\n" |
"this application.\n" |
2668 |
"\n" |
"\n" |
2669 |
"Please report bugs to: http://bugs.linuxsampler.org" |
"Please report bugs to: https://bugs.linuxsampler.org" |
2670 |
); |
); |
2671 |
dialog.set_comments(sComment.c_str()); |
dialog.set_comments(sComment.c_str()); |
2672 |
dialog.set_website("http://www.linuxsampler.org"); |
dialog.set_website("https://www.linuxsampler.org"); |
2673 |
dialog.set_website_label("http://www.linuxsampler.org"); |
dialog.set_website_label("https://www.linuxsampler.org"); |
2674 |
dialog.set_position(Gtk::WIN_POS_CENTER); |
dialog.set_position(Gtk::WIN_POS_CENTER); |
2675 |
dialog.run(); |
dialog.run(); |
2676 |
} |
} |
4111 |
dialog.set_current_folder(current_sample_dir); |
dialog.set_current_folder(current_sample_dir); |
4112 |
} |
} |
4113 |
if (dialog.run() == Gtk::RESPONSE_OK) { |
if (dialog.run() == Gtk::RESPONSE_OK) { |
4114 |
|
dialog.hide(); |
4115 |
current_sample_dir = dialog.get_current_folder(); |
current_sample_dir = dialog.get_current_folder(); |
4116 |
Glib::ustring error_files; |
Glib::ustring error_files; |
4117 |
std::vector<std::string> filenames = dialog.get_filenames(); |
std::vector<std::string> filenames = dialog.get_filenames(); |
4292 |
} |
} |
4293 |
if (dialog.run() == Gtk::RESPONSE_OK) |
if (dialog.run() == Gtk::RESPONSE_OK) |
4294 |
{ |
{ |
4295 |
|
dialog.hide(); |
4296 |
current_sample_dir = dialog.get_current_folder(); |
current_sample_dir = dialog.get_current_folder(); |
4297 |
Glib::ustring error_files; |
Glib::ustring error_files; |
4298 |
std::string folder = dialog.get_filename(); |
std::string folder = dialog.get_filename(); |
5021 |
#endif |
#endif |
5022 |
|
|
5023 |
if (dialog.run() == Gtk::RESPONSE_OK) { |
if (dialog.run() == Gtk::RESPONSE_OK) { |
5024 |
|
dialog.hide(); |
5025 |
|
#ifdef GLIB_THREADS |
5026 |
printf("on_action_merge_files self=%p\n", |
printf("on_action_merge_files self=%p\n", |
5027 |
static_cast<void*>(Glib::Threads::Thread::self())); |
static_cast<void*>(Glib::Threads::Thread::self())); |
5028 |
|
#else |
5029 |
|
std::cout << "on_action_merge_files self=" << |
5030 |
|
std::this_thread::get_id() << "\n"; |
5031 |
|
#endif |
5032 |
std::vector<std::string> filenames = dialog.get_filenames(); |
std::vector<std::string> filenames = dialog.get_filenames(); |
5033 |
|
|
5034 |
// merge the selected files to the currently open .gig file |
// merge the selected files to the currently open .gig file |