--- gigedit/trunk/src/gigedit/mainwindow.cpp 2013/09/05 00:49:13 2464 +++ gigedit/trunk/src/gigedit/mainwindow.cpp 2016/07/18 11:25:13 2968 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2013 Andreas Persson + * Copyright (C) 2006-2016 Andreas Persson * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -20,6 +20,14 @@ #include #include +#include +// 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 +#endif + #include #include #include @@ -27,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -40,14 +47,20 @@ #include #include +#include #include "mainwindow.h" - +#include "Settings.h" +#include "CombineInstrumentsDialog.h" +#include "scripteditor.h" +#include "scriptslots.h" +#include "ReferencesView.h" #include "../../gfx/status_attached.xpm" #include "../../gfx/status_detached.xpm" MainWindow::MainWindow() : + m_DimRegionChooser(*this), dimreg_label(_("Changes apply to:")), dimreg_all_regions(_("all regions")), dimreg_all_dimregs(_("all dimension splits")), @@ -76,6 +89,9 @@ m_ScrolledWindowSamples.add(m_TreeViewSamples); m_ScrolledWindowSamples.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + m_ScrolledWindowScripts.add(m_TreeViewScripts); + m_ScrolledWindowScripts.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + m_TreeViewNotebook.set_size_request(300); @@ -89,67 +105,83 @@ dimreg_vbox.pack_start(dimreg_hbox, Gtk::PACK_SHRINK); m_HPaned.add2(dimreg_vbox); + dimreg_label.set_tooltip_text(_("To automatically apply your changes above globally to the entire instrument, check all 3 check boxes on the right.")); + dimreg_all_regions.set_tooltip_text(_("If checked: all changes you perform above will automatically be applied to all regions of this instrument as well.")); + dimreg_all_dimregs.set_tooltip_text(_("If checked: all changes you perform above will automatically be applied as well to all dimension splits of the region selected below.")); + dimreg_stereo.set_tooltip_text(_("If checked: all changes you perform above will automatically be applied to both audio channel splits (only if a \"stereo\" dimension is defined below).")); m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, _("Samples")); m_TreeViewNotebook.append_page(m_ScrolledWindow, _("Instruments")); - + m_TreeViewNotebook.append_page(m_ScrolledWindowScripts, _("Scripts")); actionGroup = Gtk::ActionGroup::create(); actionGroup->add(Gtk::Action::create("MenuFile", _("_File"))); - actionGroup->add(Gtk::Action::create("New", Gtk::Stock::NEW), + actionGroup->add(Gtk::Action::create("New", _("_New")), + Gtk::AccelKey("n"), sigc::mem_fun( *this, &MainWindow::on_action_file_new)); - Glib::RefPtr action = - Gtk::Action::create("Open", Gtk::Stock::OPEN); - action->property_label() = action->property_label() + "..."; - actionGroup->add(action, + actionGroup->add(Gtk::Action::create("Open", _("_Open...")), + Gtk::AccelKey("o"), sigc::mem_fun( *this, &MainWindow::on_action_file_open)); - actionGroup->add(Gtk::Action::create("Save", Gtk::Stock::SAVE), + actionGroup->add(Gtk::Action::create("Save", _("_Save")), + Gtk::AccelKey("s"), sigc::mem_fun( *this, &MainWindow::on_action_file_save)); - action = Gtk::Action::create("SaveAs", Gtk::Stock::SAVE_AS); - action->property_label() = action->property_label() + "..."; - actionGroup->add(action, + actionGroup->add(Gtk::Action::create("SaveAs", _("Save _As...")), Gtk::AccelKey("s"), sigc::mem_fun( *this, &MainWindow::on_action_file_save_as)); actionGroup->add(Gtk::Action::create("Properties", - Gtk::Stock::PROPERTIES), + _("_Properties")), sigc::mem_fun( *this, &MainWindow::on_action_file_properties)); actionGroup->add(Gtk::Action::create("InstrProperties", - Gtk::Stock::PROPERTIES), + _("_Properties")), sigc::mem_fun( *this, &MainWindow::show_instr_props)); - actionGroup->add(Gtk::Action::create("Quit", Gtk::Stock::QUIT), + actionGroup->add(Gtk::Action::create("MidiRules", + _("_Midi Rules...")), + sigc::mem_fun( + *this, &MainWindow::show_midi_rules)); + actionGroup->add(Gtk::Action::create("ScriptSlots", + _("_Script Slots...")), + sigc::mem_fun( + *this, &MainWindow::show_script_slots)); + actionGroup->add(Gtk::Action::create("Quit", _("_Quit")), + Gtk::AccelKey("q"), sigc::mem_fun( *this, &MainWindow::on_action_quit)); - actionGroup->add(Gtk::Action::create("MenuInstrument", _("_Instrument"))); - + actionGroup->add( + Gtk::Action::create("MenuSample", _("_Sample")), + sigc::mem_fun(*this, &MainWindow::show_samples_tab) + ); + actionGroup->add( + Gtk::Action::create("MenuInstrument", _("_Instrument")), + sigc::mem_fun(*this, &MainWindow::show_intruments_tab) + ); + actionGroup->add( + Gtk::Action::create("MenuScript", _("S_cript")), + sigc::mem_fun(*this, &MainWindow::show_scripts_tab) + ); + actionGroup->add(Gtk::Action::create("AllInstruments", _("_Select"))); actionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit"))); Glib::RefPtr toggle_action = - Gtk::ToggleAction::create("CopySampleUnity", _("Copy Sample's _Unity Note"), "ffaga"); + Gtk::ToggleAction::create("CopySampleUnity", _("Copy Sample's _Unity Note")); toggle_action->set_active(true); - //FIXME: doesn't work, why? - toggle_action->set_tooltip(_("Used when dragging a sample to a region's sample reference field.")); actionGroup->add(toggle_action); toggle_action = Gtk::ToggleAction::create("CopySampleTune", _("Copy Sample's _Fine Tune")); toggle_action->set_active(true); - //FIXME: doesn't work, why? - toggle_action->set_tooltip(_("Used when dragging a sample to a region's sample reference field.")); actionGroup->add(toggle_action); toggle_action = Gtk::ToggleAction::create("CopySampleLoop", _("Copy Sample's _Loop Points")); toggle_action->set_active(true); - //FIXME: doesn't work, why? - toggle_action->set_tooltip(_("Used when dragging a sample to a region's sample reference field.")); actionGroup->add(toggle_action); @@ -161,10 +193,27 @@ sigc::mem_fun( *this, &MainWindow::on_action_view_status_bar)); - action = Gtk::Action::create("MenuHelp", Gtk::Stock::HELP); - actionGroup->add(Gtk::Action::create("MenuHelp", - action->property_label())); - actionGroup->add(Gtk::Action::create("About", Gtk::Stock::ABOUT), + toggle_action = + Gtk::ToggleAction::create("AutoRestoreWinDim", _("_Auto Restore Window Dimension")); + toggle_action->set_active(Settings::singleton()->autoRestoreWindowDimension); + actionGroup->add(toggle_action, + sigc::mem_fun( + *this, &MainWindow::on_auto_restore_win_dim)); + + toggle_action = + Gtk::ToggleAction::create("SaveWithTemporaryFile", _("Save with _temporary file")); + toggle_action->set_active(Settings::singleton()->saveWithTemporaryFile); + actionGroup->add(toggle_action, + sigc::mem_fun( + *this, &MainWindow::on_save_with_temporary_file)); + + actionGroup->add( + Gtk::Action::create("RefreshAll", _("_Refresh All")), + sigc::mem_fun(*this, &MainWindow::on_action_refresh_all) + ); + + actionGroup->add(Gtk::Action::create("MenuHelp", _("_Help"))); + actionGroup->add(Gtk::Action::create("About", _("_About")), sigc::mem_fun( *this, &MainWindow::on_action_help_about)); actionGroup->add( @@ -176,13 +225,54 @@ sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument) ); actionGroup->add( - Gtk::Action::create("RemoveInstrument", Gtk::Stock::REMOVE), + Gtk::Action::create("RemoveInstrument", _("_Remove")), sigc::mem_fun(*this, &MainWindow::on_action_remove_instrument) ); + + actionGroup->add(Gtk::Action::create("MenuSettings", _("_Settings"))); + + toggle_action = + Gtk::ToggleAction::create("WarnUserOnExtensions", _("Show warning on format _extensions")); + toggle_action->set_active(Settings::singleton()->warnUserOnExtensions); + actionGroup->add( + toggle_action, + sigc::mem_fun(*this, &MainWindow::on_action_warn_user_on_extensions) + ); + + toggle_action = + Gtk::ToggleAction::create("SyncSamplerInstrumentSelection", _("Synchronize sampler's instrument selection")); + toggle_action->set_active(Settings::singleton()->syncSamplerInstrumentSelection); + actionGroup->add( + toggle_action, + sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection) + ); + + toggle_action = + Gtk::ToggleAction::create("MoveRootNoteWithRegionMoved", _("Move root note with region moved")); + toggle_action->set_active(Settings::singleton()->moveRootNoteWithRegionMoved); + actionGroup->add( + toggle_action, + sigc::mem_fun(*this, &MainWindow::on_action_move_root_note_with_region_moved) + ); + + + actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools"))); + + actionGroup->add( + Gtk::Action::create("CombineInstruments", _("_Combine Instruments...")), + sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments) + ); + + actionGroup->add( + Gtk::Action::create("MergeFiles", _("_Merge Files...")), + sigc::mem_fun(*this, &MainWindow::on_action_merge_files) + ); + + // sample right-click popup actions actionGroup->add( - Gtk::Action::create("SampleProperties", Gtk::Stock::PROPERTIES), + Gtk::Action::create("SampleProperties", _("_Properties")), sigc::mem_fun(*this, &MainWindow::on_action_sample_properties) ); actionGroup->add( @@ -194,14 +284,45 @@ sigc::mem_fun(*this, &MainWindow::on_action_add_sample) ); actionGroup->add( - Gtk::Action::create("RemoveSample", Gtk::Stock::REMOVE), + Gtk::Action::create("RemoveSample", _("_Remove")), sigc::mem_fun(*this, &MainWindow::on_action_remove_sample) ); actionGroup->add( + Gtk::Action::create("RemoveUnusedSamples", _("Remove _Unused Samples")), + sigc::mem_fun(*this, &MainWindow::on_action_remove_unused_samples) + ); + actionGroup->add( + Gtk::Action::create("ShowSampleRefs", _("Show References...")), + sigc::mem_fun(*this, &MainWindow::on_action_view_references) + ); + actionGroup->add( + Gtk::Action::create("ReplaceSample", + _("Replace Sample...")), + sigc::mem_fun(*this, &MainWindow::on_action_replace_sample) + ); + actionGroup->add( Gtk::Action::create("ReplaceAllSamplesInAllGroups", _("Replace All Samples in All Groups...")), sigc::mem_fun(*this, &MainWindow::on_action_replace_all_samples_in_all_groups) ); + + // script right-click popup actions + actionGroup->add( + Gtk::Action::create("AddScriptGroup", _("Add _Group")), + sigc::mem_fun(*this, &MainWindow::on_action_add_script_group) + ); + actionGroup->add( + Gtk::Action::create("AddScript", _("Add _Script")), + sigc::mem_fun(*this, &MainWindow::on_action_add_script) + ); + actionGroup->add( + Gtk::Action::create("EditScript", _("_Edit Script...")), + sigc::mem_fun(*this, &MainWindow::on_action_edit_script) + ); + actionGroup->add( + Gtk::Action::create("RemoveScript", _("_Remove")), + sigc::mem_fun(*this, &MainWindow::on_action_remove_script) + ); uiManager = Gtk::UIManager::create(); uiManager->insert_action_group(actionGroup); @@ -226,10 +347,51 @@ " " " " " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " " " " " " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " + " " " " " " " " @@ -237,6 +399,8 @@ " " " " " " + " " + " " " " " " " " @@ -246,17 +410,92 @@ " " " " " " + " " + " " " " " " " " + " " + " " + " " + " " + " " + " " + " " + " " " " ""; uiManager->add_ui_from_string(ui_info); popup_menu = dynamic_cast(uiManager->get_widget("/PopupMenu")); + + // Set tooltips for menu items (for some reason, setting a tooltip on the + // respective Gtk::Action objects above will simply be ignored, no matter + // if using Gtk::Action::set_tooltip() or passing the tooltip string on + // Gtk::Action::create()). + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity")); + item->set_tooltip_text(_("Used when dragging a sample to a region's sample reference field. You may disable this for example if you want to replace an existing sample in a region with a new sample, but don't want that the region's current unity note setting will be altered by this action.")); + } + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuEdit/CopySampleTune")); + item->set_tooltip_text(_("Used when dragging a sample to a region's sample reference field. You may disable this for example if you want to replace an existing sample in a region with a new sample, but don't want that the region's current sample playback tuning will be altered by this action.")); + } + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuEdit/CopySampleLoop")); + item->set_tooltip_text(_("Used when dragging a sample to a region's sample reference field. You may disable this for example if you want to replace an existing sample in a region with a new sample, but don't want that the region's current loop informations to be altered by this action.")); + } + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuSettings/WarnUserOnExtensions")); + item->set_tooltip_text(_("If checked, a warning will be shown whenever you try to use a feature which is based on a LinuxSampler extension ontop of the original gig format, which would not work with the Gigasampler/GigaStudio application.")); + } + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuSettings/SyncSamplerInstrumentSelection")); + item->set_tooltip_text(_("If checked, the sampler's current instrument will automatically be switched whenever another instrument was selected in gigedit (only available in live-mode).")); + } + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuSettings/MoveRootNoteWithRegionMoved")); + item->set_tooltip_text(_("If checked, and when a region is moved by dragging it around on the virtual keyboard, the keybord position dependent pitch will move exactly with the amount of semi tones the region was moved around.")); + } + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuSample/RemoveUnusedSamples")); + item->set_tooltip_text(_("Removes all samples that are not referenced by any instrument (i.e. red ones).")); + // copy tooltip to popup menu + Gtk::MenuItem* item2 = dynamic_cast( + uiManager->get_widget("/SamplePopupMenu/RemoveUnusedSamples")); + item2->set_tooltip_text(item->get_tooltip_text()); + } + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuView/RefreshAll")); + item->set_tooltip_text(_("Reloads the currently open gig file and updates the entire graphical user interface.")); + } + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuView/AutoRestoreWinDim")); + item->set_tooltip_text(_("If checked, size and position of all windows will be saved and automatically restored next time.")); + } + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments")); + item->set_tooltip_text(_("Create combi sounds out of individual sounds of this .gig file.")); + } + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuTools/MergeFiles")); + item->set_tooltip_text(_("Add instruments and samples of other .gig files to this .gig file.")); + } + instrument_menu = static_cast( - uiManager->get_widget("/MenuBar/MenuInstrument"))->get_submenu(); + uiManager->get_widget("/MenuBar/MenuInstrument/AllInstruments"))->get_submenu(); Gtk::Widget* menuBar = uiManager->get_widget("/MenuBar"); m_VBox.pack_start(*menuBar, Gtk::PACK_SHRINK); @@ -282,6 +521,7 @@ // Create the Tree model: m_refTreeModel = Gtk::ListStore::create(m_Columns); m_TreeView.set_model(m_refTreeModel); + m_TreeView.set_tooltip_text(_("Right click here for actions on instruments & MIDI Rules. Drag & drop to change the order of instruments.")); instrument_name_connection = m_refTreeModel->signal_row_changed().connect( sigc::mem_fun(*this, &MainWindow::instrument_name_changed) ); @@ -289,13 +529,49 @@ // Add the TreeView's view columns: m_TreeView.append_column_editable("Instrument", m_Columns.m_col_name); m_TreeView.set_headers_visible(false); + + // establish drag&drop within the instrument tree view, allowing to reorder + // the sequence of instruments within the gig file + { + std::vector drag_target_instrument; + drag_target_instrument.push_back(Gtk::TargetEntry("gig::Instrument")); + m_TreeView.drag_source_set(drag_target_instrument); + m_TreeView.drag_dest_set(drag_target_instrument); + m_TreeView.signal_drag_begin().connect( + sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_begin) + ); + m_TreeView.signal_drag_data_get().connect( + sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drag_data_get) + ); + m_TreeView.signal_drag_data_received().connect( + sigc::mem_fun(*this, &MainWindow::on_instruments_treeview_drop_drag_data_received) + ); + } // create samples treeview (including its data model) m_refSamplesTreeModel = SamplesTreeStore::create(m_SamplesModel); m_TreeViewSamples.set_model(m_refSamplesTreeModel); + m_TreeViewSamples.set_tooltip_text(_("To actually use a sample, drag it from this list view to \"Sample\" -> \"Sample:\" on the region's settings pane on the right.\n\nRight click here for more actions on samples.")); // m_TreeViewSamples.set_reorderable(); - m_TreeViewSamples.append_column_editable("Samples", m_SamplesModel.m_col_name); - m_TreeViewSamples.set_headers_visible(false); + m_TreeViewSamples.append_column_editable(_("Name"), m_SamplesModel.m_col_name); + m_TreeViewSamples.append_column(_("Referenced"), m_SamplesModel.m_col_refcount); + { + Gtk::TreeViewColumn* column = m_TreeViewSamples.get_column(0); + Gtk::CellRendererText* cellrenderer = + dynamic_cast(column->get_first_cell()); + column->add_attribute( + cellrenderer->property_foreground(), m_SamplesModel.m_color + ); + } + { + Gtk::TreeViewColumn* column = m_TreeViewSamples.get_column(1); + Gtk::CellRendererText* cellrenderer = + dynamic_cast(column->get_first_cell()); + column->add_attribute( + cellrenderer->property_foreground(), m_SamplesModel.m_color + ); + } + m_TreeViewSamples.set_headers_visible(true); m_TreeViewSamples.signal_button_press_event().connect_notify( sigc::mem_fun(*this, &MainWindow::on_sample_treeview_button_release) ); @@ -303,6 +579,40 @@ sigc::mem_fun(*this, &MainWindow::sample_name_changed) ); + // create scripts treeview (including its data model) + m_refScriptsTreeModel = ScriptsTreeStore::create(m_ScriptsModel); + m_TreeViewScripts.set_model(m_refScriptsTreeModel); + m_TreeViewScripts.set_tooltip_text(_( + "Use CTRL + double click for editing a script." + "\n\n" + "Note: instrument scripts are a LinuxSampler extension of the gig " + "format. This feature will not work with the GigaStudio software!" + )); + // m_TreeViewScripts.set_reorderable(); + m_TreeViewScripts.append_column_editable("Samples", m_ScriptsModel.m_col_name); + m_TreeViewScripts.set_headers_visible(false); + m_TreeViewScripts.signal_button_press_event().connect_notify( + sigc::mem_fun(*this, &MainWindow::on_script_treeview_button_release) + ); + //FIXME: why the heck does this double click signal_row_activated() only fire while CTRL key is pressed ? + m_TreeViewScripts.signal_row_activated().connect( + sigc::mem_fun(*this, &MainWindow::script_double_clicked) + ); + m_refScriptsTreeModel->signal_row_changed().connect( + sigc::mem_fun(*this, &MainWindow::script_name_changed) + ); + + // establish drag&drop between scripts tree view and ScriptSlots window + std::vector drag_target_gig_script; + drag_target_gig_script.push_back(Gtk::TargetEntry("gig::Script")); + m_TreeViewScripts.drag_source_set(drag_target_gig_script); + m_TreeViewScripts.signal_drag_begin().connect( + sigc::mem_fun(*this, &MainWindow::on_scripts_treeview_drag_begin) + ); + m_TreeViewScripts.signal_drag_data_get().connect( + sigc::mem_fun(*this, &MainWindow::on_scripts_treeview_drag_data_get) + ); + // establish drag&drop between samples tree view and dimension region 'Sample' text entry std::vector drag_target_gig_sample; drag_target_gig_sample.push_back(Gtk::TargetEntry("gig::Sample")); @@ -321,12 +631,16 @@ sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed))); m_RegionChooser.signal_instrument_changed().connect( sigc::mem_fun(*this, &MainWindow::file_changed)); + m_RegionChooser.signal_instrument_changed().connect( + sigc::mem_fun(*this, &MainWindow::region_changed)); m_DimRegionChooser.signal_region_changed().connect( sigc::mem_fun(*this, &MainWindow::file_changed)); instrumentProps.signal_changed().connect( sigc::mem_fun(*this, &MainWindow::file_changed)); propDialog.signal_changed().connect( sigc::mem_fun(*this, &MainWindow::file_changed)); + midiRules.signal_changed().connect( + sigc::mem_fun(*this, &MainWindow::file_changed)); dimreg_edit.signal_dimreg_to_be_changed().connect( dimreg_to_be_changed_signal.make_slot()); @@ -334,6 +648,16 @@ dimreg_changed_signal.make_slot()); dimreg_edit.signal_sample_ref_changed().connect( sample_ref_changed_signal.make_slot()); + sample_ref_changed_signal.connect( + sigc::mem_fun(*this, &MainWindow::on_sample_ref_changed) + ); + samples_to_be_removed_signal.connect( + sigc::mem_fun(*this, &MainWindow::on_samples_to_be_removed) + ); + + dimreg_edit.signal_select_sample().connect( + sigc::mem_fun(*this, &MainWindow::select_sample) + ); m_RegionChooser.signal_instrument_struct_to_be_changed().connect( sigc::hide( @@ -375,6 +699,10 @@ // start with a new gig file by default on_action_file_new(); + + // select 'Instruments' tab by default + // (gtk allows this only if the tab childs are visible, thats why it's here) + m_TreeViewNotebook.set_current_page(1); } MainWindow::~MainWindow() @@ -455,7 +783,7 @@ void MainWindow::dimreg_changed() { update_dimregs(); - dimreg_edit.set_dim_region(m_DimRegionChooser.get_dimregion()); + dimreg_edit.set_dim_region(m_DimRegionChooser.get_main_dimregion()); } void MainWindow::on_sel_change() @@ -471,6 +799,10 @@ } m_RegionChooser.set_instrument(get_instrument()); + + if (Settings::singleton()->syncSamplerInstrumentSelection) { + switch_sampler_instrument_signal.emit(get_instrument()); + } } void loader_progress_callback(gig::progress_t* progress) @@ -490,21 +822,30 @@ void Loader::thread_function() { - printf("thread_function self=%x\n", Glib::Threads::Thread::self()); - printf("Start %s\n", filename); - RIFF::File* riff = new RIFF::File(filename); - gig = new gig::File(riff); - gig::progress_t progress; - progress.callback = loader_progress_callback; - progress.custom = this; - - gig->GetInstrument(0, &progress); - printf("End\n"); - finished_dispatcher(); + printf("thread_function self=%p\n", + static_cast(Glib::Threads::Thread::self())); + printf("Start %s\n", filename.c_str()); + try { + RIFF::File* riff = new RIFF::File(filename); + gig = new gig::File(riff); + gig::progress_t progress; + progress.callback = loader_progress_callback; + progress.custom = this; + + gig->GetInstrument(0, &progress); + printf("End\n"); + finished_dispatcher(); + } catch (RIFF::Exception e) { + error_message = e.Message; + error_dispatcher.emit(); + } catch (...) { + error_message = _("Unknown exception occurred"); + error_dispatcher.emit(); + } } Loader::Loader(const char* filename) - : filename(filename), thread(0) + : filename(filename), gig(0), thread(0), progress(0.f) { } @@ -515,7 +856,7 @@ #else thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function)); #endif - printf("launch thread=%x\n", thread); + printf("launch thread=%p\n", static_cast(thread)); } float Loader::get_progress() @@ -538,11 +879,127 @@ return finished_dispatcher; } -LoadDialog::LoadDialog(const Glib::ustring& title, Gtk::Window& parent) +Glib::Dispatcher& Loader::signal_error() +{ + return error_dispatcher; +} + +void saver_progress_callback(gig::progress_t* progress) +{ + Saver* saver = static_cast(progress->custom); + saver->progress_callback(progress->factor); +} + +void Saver::progress_callback(float fraction) +{ + { + Glib::Threads::Mutex::Lock lock(progressMutex); + progress = fraction; + } + progress_dispatcher.emit(); +} + +void Saver::thread_function() +{ + printf("thread_function self=%p\n", + static_cast(Glib::Threads::Thread::self())); + 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) + 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): " + 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): " + String(strerror(errno))); + #endif + } + } + } else { + gig->Save(filename, &progress); + } + + printf("End\n"); + finished_dispatcher.emit(); + } catch (RIFF::Exception e) { + error_message = e.Message; + error_dispatcher.emit(); + } catch (...) { + error_message = _("Unknown exception occurred"); + error_dispatcher.emit(); + } +} + +Saver::Saver(gig::File* file, Glib::ustring filename) + : gig(file), filename(filename), thread(0), progress(0.f) +{ +} + +void Saver::launch() +{ +#ifdef OLD_THREADS + thread = Glib::Thread::create(sigc::mem_fun(*this, &Saver::thread_function), true); +#else + thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function)); +#endif + printf("launch thread=%p\n", static_cast(thread)); +} + +float Saver::get_progress() +{ + float res; + { + Glib::Threads::Mutex::Lock lock(progressMutex); + res = progress; + } + return res; +} + +Glib::Dispatcher& Saver::signal_progress() +{ + return progress_dispatcher; +} + +Glib::Dispatcher& Saver::signal_finished() +{ + return finished_dispatcher; +} + +Glib::Dispatcher& Saver::signal_error() +{ + return error_dispatcher; +} + +ProgressDialog::ProgressDialog(const Glib::ustring& title, Gtk::Window& parent) : Gtk::Dialog(title, parent, true) { get_vbox()->pack_start(progressBar); show_all_children(); + resize(600,50); } // Clear all GUI elements / controls. This method is typically called @@ -553,6 +1010,7 @@ // clear the samples and instruments tree views m_refTreeModel->clear(); m_refSamplesTreeModel->clear(); + m_refScriptsTreeModel->clear(); // remove all entries from "Instrument" menu while (!instrument_menu->get_children().empty()) { remove_instrument_from_menu(0); @@ -563,6 +1021,23 @@ set_file_is_shared(false); } +void MainWindow::__refreshEntireGUI() { + // clear the samples and instruments tree views + m_refTreeModel->clear(); + m_refSamplesTreeModel->clear(); + m_refScriptsTreeModel->clear(); + // remove all entries from "Instrument" menu + while (!instrument_menu->get_children().empty()) { + remove_instrument_from_menu(0); + } + + if (!this->file) return; + + load_gig( + this->file, this->file->pInfo->Name.c_str(), this->file_is_shared + ); +} + void MainWindow::on_action_file_new() { if (!file_is_shared && file_is_changed && !close_confirmation_dialog()) return; @@ -588,13 +1063,28 @@ g_free(msg); dialog.set_secondary_text(_("If you close without saving, your changes will be lost.")); dialog.add_button(_("Close _Without Saving"), Gtk::RESPONSE_NO); - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - dialog.add_button(file_has_name ? Gtk::Stock::SAVE : Gtk::Stock::SAVE_AS, Gtk::RESPONSE_YES); + dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL); + dialog.add_button(file_has_name ? _("_Save") : _("Save _As"), Gtk::RESPONSE_YES); dialog.set_default_response(Gtk::RESPONSE_YES); int response = dialog.run(); dialog.hide(); - if (response == Gtk::RESPONSE_YES) return file_save(); - return response != Gtk::RESPONSE_CANCEL; + + // user decided to exit app without saving + if (response == Gtk::RESPONSE_NO) return true; + + // user cancelled dialog, thus don't close app + if (response == Gtk::RESPONSE_CANCEL) return false; + + // TODO: the following return valid is disabled and hard coded instead for + // now, due to the fact that saving with progress bar is now implemented + // asynchronously, as a result the app does not close automatically anymore + // after saving the file has completed + // + // if (response == Gtk::RESPONSE_YES) return file_save(); + // return response != Gtk::RESPONSE_CANCEL; + // + if (response == Gtk::RESPONSE_YES) file_save(); + return false; // always prevent closing the app for now (see comment above) } bool MainWindow::leaving_shared_mode_dialog() { @@ -605,7 +1095,7 @@ "used by the sampler until you tell the sampler explicitly to " "load it.")); dialog.add_button(_("_Yes, Detach"), Gtk::RESPONSE_YES); - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL); dialog.set_default_response(Gtk::RESPONSE_CANCEL); int response = dialog.run(); dialog.hide(); @@ -619,8 +1109,8 @@ if (file_is_shared && !leaving_shared_mode_dialog()) return; Gtk::FileChooserDialog dialog(*this, _("Open file")); - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK); + dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL); + dialog.add_button(_("_Open"), Gtk::RESPONSE_OK); dialog.set_default_response(Gtk::RESPONSE_OK); #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 Gtk::FileFilter filter; @@ -636,7 +1126,8 @@ if (dialog.run() == Gtk::RESPONSE_OK) { std::string filename = dialog.get_filename(); printf("filename=%s\n", filename.c_str()); - printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self()); + printf("on_action_file_open self=%p\n", + static_cast(Glib::Threads::Thread::self())); load_file(filename.c_str()); current_gig_dir = Glib::path_get_dirname(filename); } @@ -645,13 +1136,20 @@ void MainWindow::load_file(const char* name) { __clear(); - load_dialog = new LoadDialog(_("Loading..."), *this); - load_dialog->show_all(); - loader = new Loader(strdup(name)); + + progress_dialog = new ProgressDialog( //FIXME: memory leak! + _("Loading") + Glib::ustring(" '") + + Glib::filename_display_basename(name) + "' ...", + *this + ); + progress_dialog->show_all(); + loader = new Loader(name); //FIXME: memory leak! loader->signal_progress().connect( sigc::mem_fun(*this, &MainWindow::on_loader_progress)); loader->signal_finished().connect( sigc::mem_fun(*this, &MainWindow::on_loader_finished)); + loader->signal_error().connect( + sigc::mem_fun(*this, &MainWindow::on_loader_error)); loader->launch(); } @@ -667,20 +1165,50 @@ // load the instrument gig::File* pFile = (gig::File*) instr->GetParent(); load_gig(pFile, 0 /*file name*/, true /*shared instrument*/); - //TODO: automatically select the given instrument + // automatically select the given instrument + int i = 0; + for (gig::Instrument* instrument = pFile->GetFirstInstrument(); instrument; + instrument = pFile->GetNextInstrument(), ++i) + { + if (instrument == instr) { + // select item in "instruments" tree view + m_TreeView.get_selection()->select(Gtk::TreePath(ToString(i))); + // make sure the selected item in the "instruments" tree view is + // visible (scroll to it) + m_TreeView.scroll_to_row(Gtk::TreePath(ToString(i))); + // select item in instrument menu + { + const std::vector children = + instrument_menu->get_children(); + static_cast(children[i])->set_active(); + } + // update region chooser and dimension region chooser + m_RegionChooser.set_instrument(instr); + break; + } + } } void MainWindow::on_loader_progress() { - load_dialog->set_fraction(loader->get_progress()); + progress_dialog->set_fraction(loader->get_progress()); } void MainWindow::on_loader_finished() { printf("Loader finished!\n"); - printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self()); - load_gig(loader->gig, loader->filename); - load_dialog->hide(); + printf("on_loader_finished self=%p\n", + static_cast(Glib::Threads::Thread::self())); + load_gig(loader->gig, loader->filename.c_str()); + progress_dialog->hide(); +} + +void MainWindow::on_loader_error() +{ + Glib::ustring txt = _("Could not load file: ") + loader->error_message; + Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR); + msg.run(); + progress_dialog->hide(); } void MainWindow::on_action_file_save() @@ -719,23 +1247,54 @@ std::cout << "Saving file\n" << std::flush; file_structure_to_be_changed_signal.emit(this->file); - try { - file->Save(); - if (file_is_changed) { - set_title(get_title().substr(1)); - file_is_changed = false; - } - } catch (RIFF::Exception e) { - file_structure_changed_signal.emit(this->file); - Glib::ustring txt = _("Could not save file: ") + e.Message; - Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR); - msg.run(); - return false; - } - std::cout << "Saving file done\n" << std::flush; + + progress_dialog = new ProgressDialog( //FIXME: memory leak! + _("Saving") + Glib::ustring(" '") + + Glib::filename_display_basename(this->filename) + "' ...", + *this + ); + progress_dialog->show_all(); + saver = new Saver(this->file); //FIXME: memory leak! + saver->signal_progress().connect( + sigc::mem_fun(*this, &MainWindow::on_saver_progress)); + saver->signal_finished().connect( + sigc::mem_fun(*this, &MainWindow::on_saver_finished)); + saver->signal_error().connect( + sigc::mem_fun(*this, &MainWindow::on_saver_error)); + saver->launch(); + + return true; +} + +void MainWindow::on_saver_progress() +{ + progress_dialog->set_fraction(saver->get_progress()); +} + +void MainWindow::on_saver_error() +{ + file_structure_changed_signal.emit(this->file); + Glib::ustring txt = _("Could not save file: ") + saver->error_message; + Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR); + msg.run(); +} + +void MainWindow::on_saver_finished() +{ + this->file = saver->gig; + this->filename = saver->filename; + current_gig_dir = Glib::path_get_dirname(filename); + set_title(Glib::filename_display_basename(filename)); + file_has_name = true; + file_is_changed = false; + std::cout << "Saving file done. Importing queued samples now ...\n" << std::flush; __import_queued_samples(); + std::cout << "Importing queued samples done.\n" << std::flush; + file_structure_changed_signal.emit(this->file); - return true; + + __refreshEntireGUI(); + progress_dialog->hide(); } void MainWindow::on_action_file_save_as() @@ -746,9 +1305,9 @@ bool MainWindow::file_save_as() { - Gtk::FileChooserDialog dialog(*this, _("Save as"), Gtk::FILE_CHOOSER_ACTION_SAVE); - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - dialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK); + Gtk::FileChooserDialog dialog(*this, _("Save As"), Gtk::FILE_CHOOSER_ACTION_SAVE); + dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL); + dialog.add_button(_("_Save"), Gtk::RESPONSE_OK); dialog.set_default_response(Gtk::RESPONSE_OK); dialog.set_do_overwrite_confirmation(); @@ -779,7 +1338,9 @@ // show warning in the dialog Gtk::HBox descriptionArea; descriptionArea.set_spacing(15); - Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG)); + Gtk::Image warningIcon; + warningIcon.set_from_icon_name("dialog-warning", + Gtk::IconSize(Gtk::ICON_SIZE_DIALOG)); descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK); #if GTKMM_MAJOR_VERSION < 3 view::WrapLabel description; @@ -800,28 +1361,28 @@ descriptionArea.show_all(); if (dialog.run() == Gtk::RESPONSE_OK) { - file_structure_to_be_changed_signal.emit(this->file); - try { - std::string filename = dialog.get_filename(); - if (!Glib::str_has_suffix(filename, ".gig")) { - filename += ".gig"; - } - printf("filename=%s\n", filename.c_str()); - file->Save(filename); - this->filename = filename; - current_gig_dir = Glib::path_get_dirname(filename); - set_title(Glib::filename_display_basename(filename)); - file_has_name = true; - file_is_changed = false; - } catch (RIFF::Exception e) { - file_structure_changed_signal.emit(this->file); - Glib::ustring txt = _("Could not save file: ") + e.Message; - Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR); - msg.run(); - return false; + std::string filename = dialog.get_filename(); + if (!Glib::str_has_suffix(filename, ".gig")) { + filename += ".gig"; } - __import_queued_samples(); - file_structure_changed_signal.emit(this->file); + printf("filename=%s\n", filename.c_str()); + + progress_dialog = new ProgressDialog( //FIXME: memory leak! + _("Saving") + Glib::ustring(" '") + + Glib::filename_display_basename(filename) + "' ...", + *this + ); + progress_dialog->show_all(); + + saver = new Saver(file, filename); //FIXME: memory leak! + saver->signal_progress().connect( + sigc::mem_fun(*this, &MainWindow::on_saver_progress)); + saver->signal_finished().connect( + sigc::mem_fun(*this, &MainWindow::on_saver_finished)); + saver->signal_error().connect( + sigc::mem_fun(*this, &MainWindow::on_saver_error)); + saver->launch(); + return true; } return false; @@ -831,7 +1392,7 @@ void MainWindow::__import_queued_samples() { std::cout << "Starting sample import\n" << std::flush; Glib::ustring error_files; - printf("Samples to import: %d\n", m_SampleImportQueue.size()); + printf("Samples to import: %d\n", int(m_SampleImportQueue.size())); for (std::list::iterator iter = m_SampleImportQueue.begin(); iter != m_SampleImportQueue.end(); ) { printf("Importing sample %s\n",(*iter).sample_path.c_str()); @@ -927,6 +1488,21 @@ propDialog.deiconify(); } +void MainWindow::on_action_warn_user_on_extensions() { + Settings::singleton()->warnUserOnExtensions = + !Settings::singleton()->warnUserOnExtensions; +} + +void MainWindow::on_action_sync_sampler_instrument_selection() { + Settings::singleton()->syncSamplerInstrumentSelection = + !Settings::singleton()->syncSamplerInstrumentSelection; +} + +void MainWindow::on_action_move_root_note_with_region_moved() { + Settings::singleton()->moveRootNoteWithRegionMoved = + !Settings::singleton()->moveRootNoteWithRegionMoved; +} + void MainWindow::on_action_help_about() { Gtk::AboutDialog dialog; @@ -936,23 +1512,28 @@ dialog.set_name("Gigedit"); #endif dialog.set_version(VERSION); - dialog.set_copyright("Copyright (C) 2006-2013 Andreas Persson"); - dialog.set_comments(_( - "Released under the GNU General Public License.\n" - "\n" - "Please notice that this is still a very young instrument editor. " - "So better backup your Gigasampler files before editing them with " - "this application.\n" - "\n" - "Please report bugs to: http://bugs.linuxsampler.org") - ); + dialog.set_copyright("Copyright (C) 2006-2016 Andreas Persson"); + const std::string sComment = + _("Built " __DATE__ "\nUsing ") + + ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" + + _( + "Gigedit is released under the GNU General Public License.\n" + "\n" + "This program is distributed WITHOUT ANY WARRANTY; So better " + "backup your Gigasampler/GigaStudio files before editing them with " + "this application.\n" + "\n" + "Please report bugs to: http://bugs.linuxsampler.org" + ); + dialog.set_comments(sComment.c_str()); dialog.set_website("http://www.linuxsampler.org"); dialog.set_website_label("http://www.linuxsampler.org"); dialog.run(); } PropDialog::PropDialog() - : eName(_("Name")), + : eFileFormat(_("File Format")), + eName(_("Name")), eCreationDate(_("Creation date")), eComments(_("Comments")), eProduct(_("Product")), @@ -968,8 +1549,9 @@ eSourceForm(_("Source form")), eCommissioned(_("Commissioned")), eSubject(_("Subject")), - quitButton(Gtk::Stock::CLOSE), - table(2, 1) + quitButton(_("_Close"), true), + table(2, 1), + m_file(NULL) { set_title(_("File Properties")); eName.set_width_chars(50); @@ -991,6 +1573,7 @@ connect(eCommissioned, &DLS::Info::Commissioned); connect(eSubject, &DLS::Info::Subject); + table.add(eFileFormat); table.add(eName); table.add(eCreationDate); table.add(eComments); @@ -1021,12 +1604,40 @@ quitButton.grab_focus(); quitButton.signal_clicked().connect( sigc::mem_fun(*this, &PropDialog::hide)); + eFileFormat.signal_value_changed().connect( + sigc::mem_fun(*this, &PropDialog::onFileFormatChanged)); quitButton.show(); vbox.show(); show_all_children(); } +void PropDialog::set_file(gig::File* file) +{ + m_file = file; + + // update file format version combo box + const std::string sGiga = "Gigasampler/GigaStudio v"; + const int major = file->pVersion->major; + std::vector txts; + std::vector values; + txts.push_back(sGiga + "2"); values.push_back(2); + txts.push_back(sGiga + "3/v4"); values.push_back(3); + if (major != 2 && major != 3) { + txts.push_back(sGiga + ToString(major)); values.push_back(major); + } + std::vector texts; + for (int i = 0; i < txts.size(); ++i) texts.push_back(txts[i].c_str()); + texts.push_back(NULL); values.push_back(0); + eFileFormat.set_choices(&texts[0], &values[0]); + eFileFormat.set_value(major); +} + +void PropDialog::onFileFormatChanged() { + const int major = eFileFormat.get_value(); + if (m_file) m_file->pVersion->major = major; +} + void PropDialog::set_info(DLS::Info* info) { update(info); @@ -1061,7 +1672,7 @@ } InstrumentProps::InstrumentProps() : - quitButton(Gtk::Stock::CLOSE), + quitButton(_("_Close"), true), table(2,1), eName(_("Name")), eIsDrum(_("Is drum")), @@ -1158,16 +1769,41 @@ } } +void MainWindow::updateSampleRefCountMap(gig::File* gig) { + sample_ref_count.clear(); + + if (!gig) return; + + for (gig::Instrument* instrument = gig->GetFirstInstrument(); instrument; + instrument = gig->GetNextInstrument()) + { + for (gig::Region* rgn = instrument->GetFirstRegion(); rgn; + rgn = instrument->GetNextRegion()) + { + for (int i = 0; i < 256; ++i) { + if (!rgn->pDimensionRegions[i]) continue; + if (rgn->pDimensionRegions[i]->pSample) { + sample_ref_count[rgn->pDimensionRegions[i]->pSample]++; + } + } + } + } +} + void MainWindow::load_gig(gig::File* gig, const char* filename, bool isSharedInstrument) { file = 0; set_file_is_shared(isSharedInstrument); - this->filename = filename ? filename : _("Unsaved Gig File"); + this->filename = + (filename && strlen(filename) > 0) ? + filename : (!gig->GetFileName().empty()) ? + gig->GetFileName() : _("Unsaved Gig File"); set_title(Glib::filename_display_basename(this->filename)); file_has_name = filename; file_is_changed = false; + propDialog.set_file(gig); propDialog.set_info(gig->pInfo); instrument_name_connection.block(); @@ -1183,7 +1819,9 @@ add_instrument_to_menu(name); } instrument_name_connection.unblock(); - uiManager->get_widget("/MenuBar/MenuInstrument")->show(); + uiManager->get_widget("/MenuBar/MenuInstrument/AllInstruments")->show(); + + updateSampleRefCountMap(gig); for (gig::Group* group = gig->GetFirstGroup(); group; group = gig->GetNextGroup()) { if (group->Name != "") { @@ -1201,9 +1839,35 @@ gig_to_utf8(sample->pInfo->Name); rowSample[m_SamplesModel.m_col_sample] = sample; rowSample[m_SamplesModel.m_col_group] = NULL; + int refcount = sample_ref_count.count(sample) ? sample_ref_count[sample] : 0; + rowSample[m_SamplesModel.m_col_refcount] = ToString(refcount) + " " + _("Refs."); + rowSample[m_SamplesModel.m_color] = refcount ? "black" : "red"; } } } + + for (int i = 0; gig->GetScriptGroup(i); ++i) { + gig::ScriptGroup* group = gig->GetScriptGroup(i); + + Gtk::TreeModel::iterator iterGroup = m_refScriptsTreeModel->append(); + Gtk::TreeModel::Row rowGroup = *iterGroup; + rowGroup[m_ScriptsModel.m_col_name] = gig_to_utf8(group->Name); + rowGroup[m_ScriptsModel.m_col_group] = group; + rowGroup[m_ScriptsModel.m_col_script] = NULL; + for (int s = 0; group->GetScript(s); ++s) { + gig::Script* script = group->GetScript(s); + + Gtk::TreeModel::iterator iterScript = + m_refScriptsTreeModel->append(rowGroup.children()); + Gtk::TreeModel::Row rowScript = *iterScript; + rowScript[m_ScriptsModel.m_col_name] = gig_to_utf8(script->Name); + rowScript[m_ScriptsModel.m_col_script] = script; + rowScript[m_ScriptsModel.m_col_group] = NULL; + } + } + // unfold all sample groups & script groups by default + m_TreeViewSamples.expand_all(); + m_TreeViewScripts.expand_all(); file = gig; @@ -1211,6 +1875,10 @@ m_TreeView.get_selection()->select(Gtk::TreePath("0")); instr_props_set_instrument(); + gig::Instrument* instrument = get_instrument(); + if (instrument) { + midiRules.set_instrument(instrument); + } } bool MainWindow::instr_props_set_instrument() @@ -1258,6 +1926,36 @@ } } +void MainWindow::show_midi_rules() +{ + if (gig::Instrument* instrument = get_instrument()) + { + midiRules.set_instrument(instrument); + midiRules.show(); + midiRules.deiconify(); + } +} + +void MainWindow::show_script_slots() { + if (!file) return; + // get selected instrument + Glib::RefPtr sel = m_TreeView.get_selection(); + Gtk::TreeModel::iterator it = sel->get_selected(); + if (!it) return; + Gtk::TreeModel::Row row = *it; + gig::Instrument* instrument = row[m_Columns.m_col_instr]; + if (!instrument) return; + + ScriptSlots* window = new ScriptSlots; + window->setInstrument(instrument); + //window->reparent(*this); + window->show(); +} + +void MainWindow::on_action_refresh_all() { + __refreshEntireGUI(); +} + void MainWindow::on_action_view_status_bar() { Gtk::CheckMenuItem* item = dynamic_cast(uiManager->get_widget("/MenuBar/MenuView/Statusbar")); @@ -1269,6 +1967,26 @@ else m_StatusBar.hide(); } +void MainWindow::on_auto_restore_win_dim() { + Gtk::CheckMenuItem* item = + dynamic_cast(uiManager->get_widget("/MenuBar/MenuView/AutoRestoreWinDim")); + if (!item) { + std::cerr << "/MenuBar/MenuView/AutoRestoreWinDim == NULL\n"; + return; + } + Settings::singleton()->autoRestoreWindowDimension = item->get_active(); +} + +void MainWindow::on_save_with_temporary_file() { + Gtk::CheckMenuItem* item = + dynamic_cast(uiManager->get_widget("/MenuBar/MenuSettings/SaveWithTemporaryFile")); + if (!item) { + std::cerr << "/MenuBar/MenuSettings/SaveWithTemporaryFile == NULL\n"; + return; + } + Settings::singleton()->saveWithTemporaryFile = item->get_active(); +} + bool MainWindow::is_copy_samples_unity_note_enabled() const { Gtk::CheckMenuItem* item = dynamic_cast(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity")); @@ -1304,6 +2022,16 @@ if (button->type == GDK_2BUTTON_PRESS) { show_instr_props(); } else if (button->type == GDK_BUTTON_PRESS && button->button == 3) { + // gig v2 files have no midi rules + const bool bEnabled = !(file->pVersion && file->pVersion->major == 2); + static_cast( + uiManager->get_widget("/MenuBar/MenuInstrument/MidiRules"))->set_sensitive( + bEnabled + ); + static_cast( + uiManager->get_widget("/PopupMenu/MidiRules"))->set_sensitive( + bEnabled + ); popup_menu->popup(button->button, button->time); } } @@ -1323,6 +2051,77 @@ } } +void MainWindow::select_instrument(gig::Instrument* instrument) { + if (!instrument) return; + + Glib::RefPtr model = m_TreeView.get_model(); + for (int i = 0; i < model->children().size(); ++i) { + Gtk::TreeModel::Row row = model->children()[i]; + if (row[m_Columns.m_col_instr] == instrument) { + // select and show the respective instrument in the list view + show_intruments_tab(); + m_TreeView.get_selection()->select(model->children()[i]); + Gtk::TreePath path( + m_TreeView.get_selection()->get_selected() + ); + m_TreeView.scroll_to_row(path); + on_sel_change(); // the regular instrument selection change callback + } + } +} + +/// Returns true if requested dimension region was successfully selected and scrolled to in the list view, false on error. +bool MainWindow::select_dimension_region(gig::DimensionRegion* dimRgn) { + gig::Region* pRegion = (gig::Region*) dimRgn->GetParent(); + gig::Instrument* pInstrument = (gig::Instrument*) pRegion->GetParent(); + + Glib::RefPtr model = m_TreeView.get_model(); + for (int i = 0; i < model->children().size(); ++i) { + Gtk::TreeModel::Row row = model->children()[i]; + if (row[m_Columns.m_col_instr] == pInstrument) { + // select and show the respective instrument in the list view + show_intruments_tab(); + m_TreeView.get_selection()->select(model->children()[i]); + Gtk::TreePath path( + m_TreeView.get_selection()->get_selected() + ); + m_TreeView.scroll_to_row(path); + on_sel_change(); // the regular instrument selection change callback + + // select respective region in the region selector + m_RegionChooser.set_region(pRegion); + + // select and show the respective dimension region in the editor + //update_dimregs(); + if (!m_DimRegionChooser.select_dimregion(dimRgn)) return false; + //dimreg_edit.set_dim_region(dimRgn); + + return true; + } + } + + return false; +} + +void MainWindow::select_sample(gig::Sample* sample) { + Glib::RefPtr model = m_TreeViewSamples.get_model(); + for (int g = 0; g < model->children().size(); ++g) { + Gtk::TreeModel::Row rowGroup = model->children()[g]; + for (int s = 0; s < rowGroup.children().size(); ++s) { + Gtk::TreeModel::Row rowSample = rowGroup.children()[s]; + if (rowSample[m_SamplesModel.m_col_sample] == sample) { + show_samples_tab(); + m_TreeViewSamples.get_selection()->select(rowGroup.children()[s]); + Gtk::TreePath path( + m_TreeViewSamples.get_selection()->get_selected() + ); + m_TreeViewSamples.scroll_to_row(path); + return; + } + } + } +} + void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) { if (button->type == GDK_BUTTON_PRESS && button->button == 3) { Gtk::Menu* sample_popup = @@ -1337,19 +2136,69 @@ group_selected = row[m_SamplesModel.m_col_group]; sample_selected = row[m_SamplesModel.m_col_sample]; } + + dynamic_cast(uiManager->get_widget("/SamplePopupMenu/SampleProperties"))-> set_sensitive(group_selected || sample_selected); dynamic_cast(uiManager->get_widget("/SamplePopupMenu/AddSample"))-> set_sensitive(group_selected || sample_selected); dynamic_cast(uiManager->get_widget("/SamplePopupMenu/AddGroup"))-> set_sensitive(file); + dynamic_cast(uiManager->get_widget("/SamplePopupMenu/ShowSampleRefs"))-> + set_sensitive(sample_selected); dynamic_cast(uiManager->get_widget("/SamplePopupMenu/RemoveSample"))-> set_sensitive(group_selected || sample_selected); // show sample popup sample_popup->popup(button->button, button->time); + + dynamic_cast(uiManager->get_widget("/MenuBar/MenuSample/SampleProperties"))-> + set_sensitive(group_selected || sample_selected); + dynamic_cast(uiManager->get_widget("/MenuBar/MenuSample/AddSample"))-> + set_sensitive(group_selected || sample_selected); + dynamic_cast(uiManager->get_widget("/MenuBar/MenuSample/AddGroup"))-> + set_sensitive(file); + dynamic_cast(uiManager->get_widget("/MenuBar/MenuSample/ShowSampleRefs"))-> + set_sensitive(sample_selected); + dynamic_cast(uiManager->get_widget("/MenuBar/MenuSample/RemoveSample"))-> + set_sensitive(group_selected || sample_selected); } } +void MainWindow::on_script_treeview_button_release(GdkEventButton* button) { + if (button->type == GDK_BUTTON_PRESS && button->button == 3) { + Gtk::Menu* script_popup = + dynamic_cast(uiManager->get_widget("/ScriptPopupMenu")); + // update enabled/disabled state of sample popup items + Glib::RefPtr sel = m_TreeViewScripts.get_selection(); + Gtk::TreeModel::iterator it = sel->get_selected(); + bool group_selected = false; + bool script_selected = false; + if (it) { + Gtk::TreeModel::Row row = *it; + group_selected = row[m_ScriptsModel.m_col_group]; + script_selected = row[m_ScriptsModel.m_col_script]; + } + dynamic_cast(uiManager->get_widget("/ScriptPopupMenu/AddScript"))-> + set_sensitive(group_selected || script_selected); + dynamic_cast(uiManager->get_widget("/ScriptPopupMenu/AddScriptGroup"))-> + set_sensitive(file); + dynamic_cast(uiManager->get_widget("/ScriptPopupMenu/EditScript"))-> + set_sensitive(script_selected); + dynamic_cast(uiManager->get_widget("/ScriptPopupMenu/RemoveScript"))-> + set_sensitive(group_selected || script_selected); + // show sample popup + script_popup->popup(button->button, button->time); + + dynamic_cast(uiManager->get_widget("/MenuBar/MenuScript/AddScript"))-> + set_sensitive(group_selected || script_selected); + dynamic_cast(uiManager->get_widget("/MenuBar/MenuScript/AddScriptGroup"))-> + set_sensitive(file); + dynamic_cast(uiManager->get_widget("/MenuBar/MenuScript/EditScript"))-> + set_sensitive(script_selected); + dynamic_cast(uiManager->get_widget("/MenuBar/MenuScript/RemoveScript"))-> + set_sensitive(group_selected || script_selected); + } +} Gtk::RadioMenuItem* MainWindow::add_instrument_to_menu( const Glib::ustring& name, int position) { @@ -1476,6 +2325,12 @@ } #endif instr_props_set_instrument(); + instr = get_instrument(); + if (instr) { + midiRules.set_instrument(instr); + } else { + midiRules.hide(); + } } catch (RIFF::Exception e) { Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR); msg.run(); @@ -1491,6 +2346,124 @@ msg.run(); } +void MainWindow::on_action_add_script_group() { + static int __script_indexer = 0; + if (!file) return; + gig::ScriptGroup* group = file->AddScriptGroup(); + group->Name = gig_from_utf8(_("Unnamed Group")); + if (__script_indexer) group->Name += " " + ToString(__script_indexer); + __script_indexer++; + // update sample tree view + Gtk::TreeModel::iterator iterGroup = m_refScriptsTreeModel->append(); + Gtk::TreeModel::Row rowGroup = *iterGroup; + rowGroup[m_ScriptsModel.m_col_name] = gig_to_utf8(group->Name); + rowGroup[m_ScriptsModel.m_col_script] = NULL; + rowGroup[m_ScriptsModel.m_col_group] = group; + file_changed(); +} + +void MainWindow::on_action_add_script() { + if (!file) return; + // get selected group + Glib::RefPtr sel = m_TreeViewScripts.get_selection(); + Gtk::TreeModel::iterator it = sel->get_selected(); + if (!it) return; + Gtk::TreeModel::Row row = *it; + gig::ScriptGroup* group = row[m_ScriptsModel.m_col_group]; + if (!group) { // not a group, but a script is selected (probably) + gig::Script* script = row[m_ScriptsModel.m_col_script]; + if (!script) return; + it = row.parent(); // resolve parent (that is the script's group) + if (!it) return; + row = *it; + group = row[m_ScriptsModel.m_col_group]; + if (!group) return; + } + + // add a new script to the .gig file + gig::Script* script = group->AddScript(); + Glib::ustring name = _("Unnamed Script"); + script->Name = gig_from_utf8(name); + + // add script to the tree view + Gtk::TreeModel::iterator iterScript = + m_refScriptsTreeModel->append(row.children()); + Gtk::TreeModel::Row rowScript = *iterScript; + rowScript[m_ScriptsModel.m_col_name] = name; + rowScript[m_ScriptsModel.m_col_script] = script; + rowScript[m_ScriptsModel.m_col_group] = NULL; + + // unfold group of new script item in treeview + Gtk::TreeModel::Path path(iterScript); + m_TreeViewScripts.expand_to_path(path); +} + +void MainWindow::on_action_edit_script() { + if (!file) return; + // get selected script + Glib::RefPtr sel = m_TreeViewScripts.get_selection(); + Gtk::TreeModel::iterator it = sel->get_selected(); + if (!it) return; + Gtk::TreeModel::Row row = *it; + gig::Script* script = row[m_ScriptsModel.m_col_script]; + if (!script) return; + + ScriptEditor* editor = new ScriptEditor; + editor->signal_script_to_be_changed.connect( + signal_script_to_be_changed.make_slot() + ); + editor->signal_script_changed.connect( + signal_script_changed.make_slot() + ); + editor->setScript(script); + //editor->reparent(*this); + editor->show(); +} + +void MainWindow::on_action_remove_script() { + if (!file) return; + Glib::RefPtr sel = m_TreeViewScripts.get_selection(); + Gtk::TreeModel::iterator it = sel->get_selected(); + if (it) { + Gtk::TreeModel::Row row = *it; + gig::ScriptGroup* group = row[m_ScriptsModel.m_col_group]; + gig::Script* script = row[m_ScriptsModel.m_col_script]; + Glib::ustring name = row[m_ScriptsModel.m_col_name]; + try { + // remove script group or script from the gig file + if (group) { + // notify everybody that we're going to remove these samples +//TODO: scripts_to_be_removed_signal.emit(members); + // delete the group in the .gig file including the + // samples that belong to the group + file->DeleteScriptGroup(group); + // notify that we're done with removal +//TODO: scripts_removed_signal.emit(); + file_changed(); + } else if (script) { + // notify everybody that we're going to remove this sample +//TODO: std::list lscripts; +//TODO: lscripts.push_back(script); +//TODO: scripts_to_be_removed_signal.emit(lscripts); + // remove sample from the .gig file + script->GetGroup()->DeleteScript(script); + // notify that we're done with removal +//TODO: scripts_removed_signal.emit(); + dimreg_changed(); + file_changed(); + } + // remove respective row(s) from samples tree view + m_refScriptsTreeModel->erase(it); + } catch (RIFF::Exception e) { + // pretend we're done with removal (i.e. to avoid dead locks) +//TODO: scripts_removed_signal.emit(); + // show error message + Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR); + msg.run(); + } + } +} + void MainWindow::on_action_add_group() { static int __sample_indexer = 0; if (!file) return; @@ -1507,28 +2480,40 @@ file_changed(); } +void MainWindow::on_action_replace_sample() { + add_or_replace_sample(true); +} + void MainWindow::on_action_add_sample() { + add_or_replace_sample(false); +} + +void MainWindow::add_or_replace_sample(bool replace) { if (!file) return; - // get selected group + + // get selected group (and probably selected sample) Glib::RefPtr sel = m_TreeViewSamples.get_selection(); Gtk::TreeModel::iterator it = sel->get_selected(); if (!it) return; Gtk::TreeModel::Row row = *it; + gig::Sample* sample = NULL; gig::Group* group = row[m_SamplesModel.m_col_group]; if (!group) { // not a group, but a sample is selected (probably) - gig::Sample* sample = row[m_SamplesModel.m_col_sample]; - if (!sample) return; + if (replace) sample = row[m_SamplesModel.m_col_sample]; + if (!row[m_SamplesModel.m_col_sample]) return; it = row.parent(); // resolve parent (that is the sample's group) if (!it) return; - row = *it; - group = row[m_SamplesModel.m_col_group]; + if (!replace) row = *it; + group = (*it)[m_SamplesModel.m_col_group]; if (!group) return; } + if (replace && !sample) return; + // show 'browse for file' dialog - Gtk::FileChooserDialog dialog(*this, _("Add Sample(s)")); - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK); - dialog.set_select_multiple(true); + Gtk::FileChooserDialog dialog(*this, replace ? _("Replace Sample with") : _("Add Sample(s)")); + dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL); + dialog.add_button(_("_Open"), Gtk::RESPONSE_OK); + dialog.set_select_multiple(!replace); // allow multi audio file selection only when adding new samples, does not make sense when replacing a specific sample // matches all file types supported by libsndfile #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 @@ -1599,8 +2584,8 @@ sf_close(hFile); // close sound file throw std::string(_("format not supported")); // unsupported subformat (yet?) } - // add a new sample to the .gig file - gig::Sample* sample = file->AddSample(); + // add a new sample to the .gig file (if adding is requested actually) + if (!replace) sample = file->AddSample(); // file name without path Glib::ustring filename = Glib::filename_display_basename(*iter); // remove file extension if there is one @@ -1624,6 +2609,7 @@ &instrument, sizeof(instrument)) != SF_FALSE) { sample->MIDIUnityNote = instrument.basenote; + sample->FineTune = instrument.detune; if (instrument.loop_count && instrument.loops[0].mode != SF_LOOP_NONE) { sample->Loops = 1; @@ -1650,7 +2636,7 @@ // physically when File::Save() is called) sample->Resize(info.frames); // make sure sample is part of the selected group - group->AddSample(sample); + if (!replace) group->AddSample(sample); // schedule that physical resize and sample import // (data copying), performed when "Save" is requested SampleImportItem sched_item; @@ -1658,13 +2644,17 @@ sched_item.sample_path = *iter; m_SampleImportQueue.push_back(sched_item); // add sample to the tree view - Gtk::TreeModel::iterator iterSample = - m_refSamplesTreeModel->append(row.children()); - Gtk::TreeModel::Row rowSample = *iterSample; - rowSample[m_SamplesModel.m_col_name] = - gig_to_utf8(sample->pInfo->Name); - rowSample[m_SamplesModel.m_col_sample] = sample; - rowSample[m_SamplesModel.m_col_group] = NULL; + if (replace) { + row[m_SamplesModel.m_col_name] = gig_to_utf8(sample->pInfo->Name); + } else { + Gtk::TreeModel::iterator iterSample = + m_refSamplesTreeModel->append(row.children()); + Gtk::TreeModel::Row rowSample = *iterSample; + rowSample[m_SamplesModel.m_col_name] = + gig_to_utf8(sample->pInfo->Name); + rowSample[m_SamplesModel.m_col_sample] = sample; + rowSample[m_SamplesModel.m_col_group] = NULL; + } // close sound file sf_close(hFile); file_changed(); @@ -1675,7 +2665,11 @@ } // show error message box when some file(s) could not be opened / added if (!error_files.empty()) { - Glib::ustring txt = _("Could not add the following sample(s):\n") + error_files; + Glib::ustring txt = + (replace + ? _("Failed to replace sample with:\n") + : _("Could not add the following sample(s):\n")) + + error_files; Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR); msg.run(); } @@ -1718,7 +2712,7 @@ dialog.get_vbox()->pack_start(entryArea, Gtk::PACK_SHRINK); description.show(); entryArea.show_all(); - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL); dialog.add_button(_("Select"), Gtk::RESPONSE_OK); dialog.set_select_multiple(false); if (current_sample_dir != "") { @@ -1742,18 +2736,14 @@ try { if (!hFile) throw std::string(_("could not open file")); - int bitdepth; switch (info.format & 0xff) { case SF_FORMAT_PCM_S8: case SF_FORMAT_PCM_16: case SF_FORMAT_PCM_U8: - bitdepth = 16; - break; case SF_FORMAT_PCM_24: case SF_FORMAT_PCM_32: case SF_FORMAT_FLOAT: case SF_FORMAT_DOUBLE: - bitdepth = 24; break; default: sf_close(hFile); @@ -1859,6 +2849,153 @@ } } +void MainWindow::on_action_remove_unused_samples() { + if (!file) return; + + // collect all samples that are not referenced by any instrument + std::list lsamples; + for (int iSample = 0; file->GetSample(iSample); ++iSample) { + gig::Sample* sample = file->GetSample(iSample); + bool isUsed = false; + for (gig::Instrument* instrument = file->GetFirstInstrument(); instrument; + instrument = file->GetNextInstrument()) + { + for (gig::Region* rgn = instrument->GetFirstRegion(); rgn; + rgn = instrument->GetNextRegion()) + { + for (int i = 0; i < 256; ++i) { + if (!rgn->pDimensionRegions[i]) continue; + if (rgn->pDimensionRegions[i]->pSample != sample) continue; + isUsed = true; + goto endOfRefSearch; + } + } + } + endOfRefSearch: + if (!isUsed) lsamples.push_back(sample); + } + + if (lsamples.empty()) return; + + // notify everybody that we're going to remove these samples + samples_to_be_removed_signal.emit(lsamples); + + // remove collected samples + try { + for (std::list::iterator itSample = lsamples.begin(); + itSample != lsamples.end(); ++itSample) + { + gig::Sample* sample = *itSample; + // remove sample from the .gig file + file->DeleteSample(sample); + // if sample was just previously added, remove it fro the import queue + for (std::list::iterator iter = m_SampleImportQueue.begin(); + iter != m_SampleImportQueue.end(); ++iter) + { + if ((*iter).gig_sample == sample) { + printf("Removing previously added sample '%s'\n", + (*iter).sample_path.c_str()); + m_SampleImportQueue.erase(iter); + break; + } + } + } + } catch (RIFF::Exception e) { + // show error message + Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR); + msg.run(); + } + + // notify everybody that we're done with removal + samples_removed_signal.emit(); + + dimreg_changed(); + file_changed(); + __refreshEntireGUI(); +} + +// see comment on on_sample_treeview_drag_begin() +void MainWindow::on_scripts_treeview_drag_begin(const Glib::RefPtr& context) +{ + first_call_to_drag_data_get = true; +} + +void MainWindow::on_scripts_treeview_drag_data_get(const Glib::RefPtr&, + Gtk::SelectionData& selection_data, guint, guint) +{ + if (!first_call_to_drag_data_get) return; + first_call_to_drag_data_get = false; + + // get selected script + gig::Script* script = NULL; + Glib::RefPtr sel = m_TreeViewScripts.get_selection(); + Gtk::TreeModel::iterator it = sel->get_selected(); + if (it) { + Gtk::TreeModel::Row row = *it; + script = row[m_ScriptsModel.m_col_script]; + } + // pass the gig::Script as pointer + selection_data.set(selection_data.get_target(), 0/*unused*/, + (const guchar*)&script, + sizeof(script)/*length of data in bytes*/); +} + +// see comment on on_sample_treeview_drag_begin() +void MainWindow::on_instruments_treeview_drag_begin(const Glib::RefPtr& context) +{ + first_call_to_drag_data_get = true; +} + +void MainWindow::on_instruments_treeview_drag_data_get(const Glib::RefPtr&, + Gtk::SelectionData& selection_data, guint, guint) +{ + if (!first_call_to_drag_data_get) return; + first_call_to_drag_data_get = false; + + // get selected source instrument + gig::Instrument* src = NULL; + { + Glib::RefPtr sel = m_TreeView.get_selection(); + Gtk::TreeModel::iterator it = sel->get_selected(); + if (it) { + Gtk::TreeModel::Row row = *it; + src = row[m_Columns.m_col_instr]; + } + } + if (!src) return; + + // pass the source gig::Instrument as pointer + selection_data.set(selection_data.get_target(), 0/*unused*/, (const guchar*)&src, + sizeof(src)/*length of data in bytes*/); +} + +void MainWindow::on_instruments_treeview_drop_drag_data_received( + const Glib::RefPtr& context, int x, int y, + const Gtk::SelectionData& selection_data, guint, guint time) +{ + gig::Instrument* src = *((gig::Instrument**) selection_data.get_data()); + if (!src || selection_data.get_length() != sizeof(gig::Instrument*)) + return; + + gig::Instrument* dst = NULL; + { + Gtk::TreeModel::Path path; + const bool found = m_TreeView.get_path_at_pos(x, y, path); + if (!found) return; + + Gtk::TreeModel::iterator iter = m_refTreeModel->get_iter(path); + if (!iter) return; + Gtk::TreeModel::Row row = *iter; + dst = row[m_Columns.m_col_instr]; + } + if (!dst) return; + + //printf("dragdrop received src=%s dst=%s\n", src->pInfo->Name.c_str(), dst->pInfo->Name.c_str()); + src->MoveTo(dst); + __refreshEntireGUI(); + select_instrument(src); +} + // For some reason drag_data_get gets called two times for each // drag'n'drop (at least when target is an Entry). This work-around // makes sure the code in drag_data_get and drop_drag_data_received is @@ -1917,9 +3054,11 @@ bool channels_changed = false; if (sample->Channels == 1 && stereo_dimension) { // remove the samplechannel dimension +/* commented out, because it makes it impossible building up an instrument from scratch using two separate L/R samples region->DeleteDimension(stereo_dimension); channels_changed = true; region_changed(); +*/ } dimreg_edit.set_sample( sample, @@ -1985,6 +3124,50 @@ } } +void MainWindow::script_name_changed(const Gtk::TreeModel::Path& path, + const Gtk::TreeModel::iterator& iter) { + if (!iter) return; + Gtk::TreeModel::Row row = *iter; + Glib::ustring name = row[m_ScriptsModel.m_col_name]; + gig::ScriptGroup* group = row[m_ScriptsModel.m_col_group]; + gig::Script* script = row[m_ScriptsModel.m_col_script]; + gig::String gigname(gig_from_utf8(name)); + if (group) { + if (group->Name != gigname) { + group->Name = gigname; + printf("script group name changed\n"); + file_changed(); + } + } else if (script) { + if (script->Name != gigname) { + script->Name = gigname; + printf("script name changed\n"); + file_changed(); + } + } +} + +void MainWindow::script_double_clicked(const Gtk::TreeModel::Path& path, + Gtk::TreeViewColumn* column) +{ + Gtk::TreeModel::iterator iter = m_refScriptsTreeModel->get_iter(path); + if (!iter) return; + Gtk::TreeModel::Row row = *iter; + gig::Script* script = row[m_ScriptsModel.m_col_script]; + if (!script) return; + + ScriptEditor* editor = new ScriptEditor; + editor->signal_script_to_be_changed.connect( + signal_script_to_be_changed.make_slot() + ); + editor->signal_script_changed.connect( + signal_script_changed.make_slot() + ); + editor->setScript(script); + //editor->reparent(*this); + editor->show(); +} + void MainWindow::instrument_name_changed(const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter) { if (!iter) return; @@ -2019,6 +3202,203 @@ } } +void MainWindow::on_action_combine_instruments() { + CombineInstrumentsDialog* d = new CombineInstrumentsDialog(*this, file); + d->show_all(); + d->resize(500, 400); + d->run(); + if (d->fileWasChanged()) { + // update GUI with new instrument just created + add_instrument(d->newCombinedInstrument()); + } + delete d; +} + +void MainWindow::on_action_view_references() { + Glib::RefPtr sel = m_TreeViewSamples.get_selection(); + Gtk::TreeModel::iterator it = sel->get_selected(); + if (!it) return; + Gtk::TreeModel::Row row = *it; + gig::Sample* sample = row[m_SamplesModel.m_col_sample]; + if (!sample) return; + + ReferencesView* d = new ReferencesView(*this); + d->setSample(sample); + d->dimension_region_selected.connect( + sigc::mem_fun(*this, &MainWindow::select_dimension_region) + ); + d->show_all(); + d->resize(500, 400); + d->run(); + delete d; +} + +void MainWindow::mergeFiles(const std::vector& filenames) { + struct _Source { + std::vector riffs; + std::vector gigs; + + ~_Source() { + for (int k = 0; k < gigs.size(); ++k) delete gigs[k]; + for (int k = 0; k < riffs.size(); ++k) delete riffs[k]; + riffs.clear(); + gigs.clear(); + } + } sources; + + if (filenames.empty()) + throw RIFF::Exception(_("No files selected, so nothing done.")); + + // first open all input files (to avoid output file corruption) + int i; + try { + for (i = 0; i < filenames.size(); ++i) { + const std::string& filename = filenames[i]; + printf("opening file=%s\n", filename.c_str()); + + RIFF::File* riff = new RIFF::File(filename); + sources.riffs.push_back(riff); + + gig::File* gig = new gig::File(riff); + sources.gigs.push_back(gig); + } + } catch (RIFF::Exception e) { + throw RIFF::Exception( + _("Error occurred while opening '") + + filenames[i] + + "': " + + e.Message + ); + } catch (...) { + throw RIFF::Exception( + _("Unknown exception occurred while opening '") + + filenames[i] + "'" + ); + } + + // now merge the opened .gig files to the main .gig file currently being + // open in gigedit + try { + for (i = 0; i < filenames.size(); ++i) { + const std::string& filename = filenames[i]; + printf("merging file=%s\n", filename.c_str()); + assert(i < sources.gigs.size()); + + this->file->AddContentOf(sources.gigs[i]); + } + } catch (RIFF::Exception e) { + throw RIFF::Exception( + _("Error occurred while merging '") + + filenames[i] + + "': " + + e.Message + ); + } catch (...) { + throw RIFF::Exception( + _("Unknown exception occurred while merging '") + + filenames[i] + "'" + ); + } + + // Finally save gig file persistently to disk ... + //NOTE: requires that this gig file already has a filename ! + { + std::cout << "Saving file\n" << std::flush; + file_structure_to_be_changed_signal.emit(this->file); + + progress_dialog = new ProgressDialog( //FIXME: memory leak! + _("Saving") + Glib::ustring(" '") + + Glib::filename_display_basename(this->filename) + "' ...", + *this + ); + progress_dialog->show_all(); + saver = new Saver(this->file); //FIXME: memory leak! + saver->signal_progress().connect( + sigc::mem_fun(*this, &MainWindow::on_saver_progress)); + saver->signal_finished().connect( + sigc::mem_fun(*this, &MainWindow::on_saver_finished)); + saver->signal_error().connect( + sigc::mem_fun(*this, &MainWindow::on_saver_error)); + saver->launch(); + } +} + +void MainWindow::on_action_merge_files() { + if (this->file->GetFileName().empty()) { + Glib::ustring txt = _( + "You seem to have a new .gig file open that has not been saved " + "yet. You must save it somewhere before starting to merge it with " + "other .gig files though, because during the merge operation the " + "other files' sample data must be written on file level to the " + "target .gig file." + ); + Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR); + msg.run(); + return; + } + + Gtk::FileChooserDialog dialog(*this, _("Merge .gig files")); + dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL); + dialog.add_button(_("Merge"), Gtk::RESPONSE_OK); + dialog.set_default_response(Gtk::RESPONSE_CANCEL); +#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 + Gtk::FileFilter filter; + filter.add_pattern("*.gig"); +#else + Glib::RefPtr filter = Gtk::FileFilter::create(); + filter->add_pattern("*.gig"); +#endif + dialog.set_filter(filter); + if (current_gig_dir != "") { + dialog.set_current_folder(current_gig_dir); + } + dialog.set_select_multiple(true); + + // show warning in the file picker dialog + Gtk::HBox descriptionArea; + descriptionArea.set_spacing(15); + Gtk::Image warningIcon; + warningIcon.set_from_icon_name("dialog-warning", + Gtk::IconSize(Gtk::ICON_SIZE_DIALOG)); + descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK); +#if GTKMM_MAJOR_VERSION < 3 + view::WrapLabel description; +#else + Gtk::Label description; + description.set_line_wrap(); +#endif + description.set_markup(_( + "\nSelect at least one .gig file that shall be merged to the .gig file " + "currently being open in gigedit.\n\n" + "Please Note: Merging with other files will modify your " + "currently open .gig file on file level! And be aware that the current " + "merge algorithm does not detect duplicate samples yet. So if you are " + "merging files which are using equivalent sample data, those " + "equivalent samples will currently be treated as separate samples and " + "will accordingly be stored separately in the target .gig file!" + )); + descriptionArea.pack_start(description); + dialog.get_vbox()->pack_start(descriptionArea, Gtk::PACK_SHRINK); + descriptionArea.show_all(); + + if (dialog.run() == Gtk::RESPONSE_OK) { + printf("on_action_merge_files self=%p\n", + static_cast(Glib::Threads::Thread::self())); + std::vector filenames = dialog.get_filenames(); + + // merge the selected files to the currently open .gig file + try { + mergeFiles(filenames); + } catch (RIFF::Exception e) { + Gtk::MessageDialog msg(*this, e.Message, false, Gtk::MESSAGE_ERROR); + msg.run(); + } + + // update GUI + __refreshEntireGUI(); + } +} + void MainWindow::set_file_is_shared(bool b) { this->file_is_shared = b; @@ -2033,6 +3413,56 @@ Gdk::Pixbuf::create_from_xpm_data(status_detached_xpm) ); } + + { + Gtk::MenuItem* item = dynamic_cast( + uiManager->get_widget("/MenuBar/MenuSettings/SyncSamplerInstrumentSelection")); + if (item) item->set_sensitive(b); + } +} + +void MainWindow::on_sample_ref_count_incremented(gig::Sample* sample, int offset) { + if (!sample) return; + sample_ref_count[sample] += offset; + const int refcount = sample_ref_count[sample]; + + Glib::RefPtr model = m_TreeViewSamples.get_model(); + for (int g = 0; g < model->children().size(); ++g) { + Gtk::TreeModel::Row rowGroup = model->children()[g]; + for (int s = 0; s < rowGroup.children().size(); ++s) { + Gtk::TreeModel::Row rowSample = rowGroup.children()[s]; + if (rowSample[m_SamplesModel.m_col_sample] != sample) continue; + rowSample[m_SamplesModel.m_col_refcount] = ToString(refcount) + " " + _("Refs."); + rowSample[m_SamplesModel.m_color] = refcount ? "black" : "red"; + } + } +} + +void MainWindow::on_sample_ref_changed(gig::Sample* oldSample, gig::Sample* newSample) { + on_sample_ref_count_incremented(oldSample, -1); + on_sample_ref_count_incremented(newSample, +1); +} + +void MainWindow::on_samples_to_be_removed(std::list samples) { + // just in case a new sample is added later with exactly the same memory + // address, which would lead to incorrect refcount if not deleted here + for (std::list::const_iterator it = samples.begin(); + it != samples.end(); ++it) + { + sample_ref_count.erase(*it); + } +} + +void MainWindow::show_samples_tab() { + m_TreeViewNotebook.set_current_page(0); +} + +void MainWindow::show_intruments_tab() { + m_TreeViewNotebook.set_current_page(1); +} + +void MainWindow::show_scripts_tab() { + m_TreeViewNotebook.set_current_page(2); } sigc::signal& MainWindow::signal_file_structure_to_be_changed() { @@ -2090,3 +3520,7 @@ sigc::signal& MainWindow::signal_keyboard_key_released() { return m_RegionChooser.signal_keyboard_key_released(); } + +sigc::signal& MainWindow::signal_switch_sampler_instrument() { + return switch_sampler_instrument_signal; +}