--- gigedit/trunk/src/gigedit/mainwindow.h	2007/12/08 12:28:53	1582
+++ gigedit/trunk/src/gigedit/mainwindow.h	2012/03/04 09:01:40	2325
@@ -1,5 +1,5 @@
 /*                                                         -*- c++ -*-
- * Copyright (C) 2006, 2007 Andreas Persson
+ * Copyright (C) 2006 - 2008 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
@@ -40,6 +40,9 @@
 #include "regionchooser.h"
 #include "dimregionchooser.h"
 #include "dimregionedit.h"
+#ifndef OLD_THREADS
+#include <glibmm/threads.h>
+#endif
 
 class MainWindow;
 
@@ -186,11 +189,11 @@
     gig::File* gig;
 
 private:
-    Glib::Thread* thread;
+    Glib::Threads::Thread* thread;
     void thread_function();
     Glib::Dispatcher finished_dispatcher;
     Glib::Dispatcher progress_dispatcher;
-    Glib::Mutex progressMutex;
+    Glib::Threads::Mutex progressMutex;
     float progress;
 };
 
@@ -209,8 +212,15 @@
     sigc::signal<void, gig::Region*>& signal_region_changed();
     sigc::signal<void, gig::DimensionRegion*>& signal_dimreg_to_be_changed();
     sigc::signal<void, gig::DimensionRegion*>& signal_dimreg_changed();
+    sigc::signal<void, gig::Sample*>& signal_sample_changed();
     sigc::signal<void, gig::Sample*/*old*/, gig::Sample*/*new*/>& signal_sample_ref_changed();
 
+    sigc::signal<void, int/*key*/, int/*velocity*/>& signal_note_on();
+    sigc::signal<void, int/*key*/, int/*velocity*/>& signal_note_off();
+
+    sigc::signal<void, int/*key*/, int/*velocity*/>& signal_keyboard_key_hit();
+    sigc::signal<void, int/*key*/, int/*velocity*/>& signal_keyboard_key_released();
+
 protected:
     Glib::RefPtr<Gtk::ActionGroup> actionGroup;
     Glib::RefPtr<Gtk::UIManager> uiManager;
@@ -233,8 +243,12 @@
     sigc::signal<void, gig::Region*> region_changed_signal;
     sigc::signal<void, gig::DimensionRegion*> dimreg_to_be_changed_signal;
     sigc::signal<void, gig::DimensionRegion*> dimreg_changed_signal;
+    sigc::signal<void, gig::Sample*> sample_changed_signal;
     sigc::signal<void, gig::Sample*/*old*/, gig::Sample*/*new*/> sample_ref_changed_signal;
 
+    sigc::signal<void, int/*key*/, int/*velocity*/> note_on_signal;
+    sigc::signal<void, int/*key*/, int/*velocity*/> note_off_signal;
+
     void on_instrument_selection_change(int index);
     void on_sel_change();
     void region_changed();
@@ -327,6 +341,7 @@
     void on_action_sample_properties();
     void on_action_add_group();
     void on_action_add_sample();
+    void on_action_replace_all_samples_in_all_groups();
     void on_action_remove_sample();
 
     void on_action_add_instrument();
@@ -341,7 +356,8 @@
     bool file_has_name;
     bool file_is_changed;
     std::string filename;
-    std::string current_dir;
+    std::string current_gig_dir;
+    std::string current_sample_dir;
 
     void set_file_is_shared(bool);