--- gigedit/trunk/src/gigedit/mainwindow.h	2014/12/29 16:30:21	2683
+++ gigedit/trunk/src/gigedit/mainwindow.h	2015/06/11 20:29:22	2772
@@ -1,5 +1,5 @@
 /*                                                         -*- c++ -*-
- * Copyright (C) 2006 - 2014 Andreas Persson
+ * Copyright (C) 2006 - 2015 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
@@ -196,6 +196,8 @@
     sigc::signal<void, int/*key*/, int/*velocity*/>& signal_keyboard_key_hit();
     sigc::signal<void, int/*key*/, int/*velocity*/>& signal_keyboard_key_released();
 
+    sigc::signal<void, gig::Instrument*>& signal_switch_sampler_instrument();
+
 protected:
     Glib::RefPtr<Gtk::ActionGroup> actionGroup;
     Glib::RefPtr<Gtk::UIManager> uiManager;
@@ -225,10 +227,15 @@
     sigc::signal<void, int/*key*/, int/*velocity*/> note_on_signal;
     sigc::signal<void, int/*key*/, int/*velocity*/> note_off_signal;
 
+    sigc::signal<void, gig::Instrument*> switch_sampler_instrument_signal;
+
     void on_instrument_selection_change(Gtk::RadioMenuItem* item);
     void on_sel_change();
     void region_changed();
     void dimreg_changed();
+    void select_instrument(gig::Instrument* instrument);
+    bool select_dimension_region(gig::DimensionRegion* dimRgn);
+    void select_sample(gig::Sample* sample);
     void on_loader_progress();
     void on_loader_finished();
     void on_loader_error();
@@ -351,7 +358,9 @@
     void show_midi_rules();
     void show_script_slots();
     void on_action_view_status_bar();
+    void on_action_refresh_all();
     void on_action_warn_user_on_extensions();
+    void on_action_sync_sampler_instrument_selection();
     void on_action_help_about();
 
     // sample right-click popup actions
@@ -359,9 +368,11 @@
     void on_action_sample_properties();
     void on_action_add_group();
     void on_action_add_sample();
+    void on_action_replace_sample();
     void on_action_replace_all_samples_in_all_groups();
     void on_action_remove_sample();
-    
+    void on_action_remove_unused_samples();
+
     // script right-click popup actions
     void on_script_treeview_button_release(GdkEventButton* button);
     void on_action_add_script_group();
@@ -403,6 +414,13 @@
     bool check_if_savable();
 
     void on_button_release(GdkEventButton* button);
+    void on_instruments_treeview_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
+    void on_instruments_treeview_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&,
+                                               Gtk::SelectionData& selection_data, guint, guint);
+    void on_instruments_treeview_drop_drag_data_received(
+        const Glib::RefPtr<Gdk::DragContext>& context, int, int,
+        const Gtk::SelectionData& selection_data, guint, guint time
+    );
     void on_scripts_treeview_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context);
     void on_scripts_treeview_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&,
                                            Gtk::SelectionData& selection_data, guint, guint);
@@ -433,6 +451,8 @@
     void on_sample_ref_count_incremented(gig::Sample* sample, int offset);
     void on_samples_to_be_removed(std::list<gig::Sample*> samples);
 
+    void add_or_replace_sample(bool replace);
+
     void __import_queued_samples();
     void __clear();
     void __refreshEntireGUI();