--- gigedit/trunk/src/gigedit/mainwindow.h 2014/06/07 22:34:31 2604 +++ gigedit/trunk/src/gigedit/mainwindow.h 2014/06/17 22:55:02 2644 @@ -231,17 +231,23 @@ Gtk::Menu* instrument_menu; + std::map sample_ref_count; + class SamplesModel : public Gtk::TreeModel::ColumnRecord { public: SamplesModel() { add(m_col_name); add(m_col_sample); add(m_col_group); + add(m_col_refcount); + add(m_color); } Gtk::TreeModelColumn m_col_name; Gtk::TreeModelColumn m_col_sample; Gtk::TreeModelColumn m_col_group; + Gtk::TreeModelColumn m_col_refcount; + Gtk::TreeModelColumn m_color; } m_SamplesModel; class SamplesTreeStore : public Gtk::TreeStore { @@ -312,6 +318,7 @@ void show_instr_props(); bool instr_props_set_instrument(); void show_midi_rules(); + void show_script_slots(); void on_action_view_status_bar(); void on_action_warn_user_on_extensions(); void on_action_help_about(); @@ -335,6 +342,10 @@ void on_action_duplicate_instrument(); void on_action_remove_instrument(); + void show_samples_tab(); + void show_intruments_tab(); + void show_scripts_tab(); + void add_instrument(gig::Instrument* instrument); Gtk::RadioMenuItem* add_instrument_to_menu(const Glib::ustring& name, int position = -1); @@ -343,6 +354,7 @@ LoadDialog* load_dialog; Loader* loader; void load_gig(gig::File* gig, const char* filename, bool isSharedInstrument = false); + void updateSampleRefCountMap(gig::File* gig); gig::File* file; bool file_is_shared; @@ -359,6 +371,9 @@ bool check_if_savable(); void on_button_release(GdkEventButton* button); + void on_scripts_treeview_drag_begin(const Glib::RefPtr& context); + void on_scripts_treeview_drag_data_get(const Glib::RefPtr&, + Gtk::SelectionData& selection_data, guint, guint); void on_sample_treeview_drag_begin(const Glib::RefPtr& context); void on_sample_treeview_drag_data_get(const Glib::RefPtr&, Gtk::SelectionData& selection_data, guint, guint); @@ -369,6 +384,7 @@ void script_name_changed(const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter); + void script_double_clicked(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column); void sample_name_changed(const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter); void instrument_name_changed(const Gtk::TreeModel::Path& path, @@ -377,9 +393,14 @@ sigc::connection instrument_name_connection; void on_action_combine_instruments(); + void on_action_view_references(); void on_action_merge_files(); void mergeFiles(const std::vector& filenames); + void on_sample_ref_changed(gig::Sample* oldSample, gig::Sample* newSample); + void on_sample_ref_count_incremented(gig::Sample* sample, int offset); + void on_samples_to_be_removed(std::list samples); + void __import_queued_samples(); void __clear(); void __refreshEntireGUI();