projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OSC: Add /path/band extension for eq_* bands
[ardour.git]
/
gtk2_ardour
/
sfdb_ui.h
diff --git
a/gtk2_ardour/sfdb_ui.h
b/gtk2_ardour/sfdb_ui.h
index 249ebf3535834d6d49662c4b8c0578abc6cc535f..f070d36ab6daf245313921daac16de4339484ad8 100644
(file)
--- a/
gtk2_ardour/sfdb_ui.h
+++ b/
gtk2_ardour/sfdb_ui.h
@@
-36,6
+36,7
@@
#include <gtkmm/filechooserwidget.h>
#include <gtkmm/frame.h>
#include <gtkmm/label.h>
#include <gtkmm/filechooserwidget.h>
#include <gtkmm/frame.h>
#include <gtkmm/label.h>
+#include <gtkmm/scale.h>
#include <gtkmm/textview.h>
#include <gtkmm/table.h>
#include <gtkmm/liststore.h>
#include <gtkmm/textview.h>
#include <gtkmm/table.h>
#include <gtkmm/liststore.h>
@@
-46,9
+47,10
@@
#include "ardour/audiofilesource.h"
#include "ardour/session_handle.h"
#include "ardour/audiofilesource.h"
#include "ardour/session_handle.h"
-#include "ardour_
dialog
.h"
+#include "ardour_
window
.h"
#include "editing.h"
#include "audio_clock.h"
#include "editing.h"
#include "audio_clock.h"
+#include "instrument_selector.h"
namespace ARDOUR {
class Session;
namespace ARDOUR {
class Session;
@@
-57,7
+59,7
@@
namespace ARDOUR {
class GainMeter;
class Mootcher;
class GainMeter;
class Mootcher;
-class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr
+class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr
, public PBD::ScopedConnectionList
{
public:
SoundFileBox (bool persistent);
{
public:
SoundFileBox (bool persistent);
@@
-69,6
+71,8
@@
class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr
void audition();
bool audition_oneshot();
bool autoplay () const;
void audition();
bool audition_oneshot();
bool autoplay () const;
+ void set_src_quality(ARDOUR::SrcQuality q) { _src_quality = q; }
+ void set_import_position(Editing::ImportPosition p) { _import_position = p; }
protected:
std::string path;
protected:
std::string path;
@@
-103,14
+107,24
@@
class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr
Gtk::Button stop_btn;
Gtk::CheckButton autoplay_btn;
Gtk::Button apply_btn;
Gtk::Button stop_btn;
Gtk::CheckButton autoplay_btn;
Gtk::Button apply_btn;
+ Gtk::HScale seek_slider;
+
+ PBD::ScopedConnectionList auditioner_connections;
+ void audition_active(bool);
+ void audition_progress(ARDOUR::framecnt_t, ARDOUR::framecnt_t);
bool tags_entry_left (GdkEventFocus* event);
void tags_changed ();
void save_tags (const std::vector<std::string>&);
void stop_audition ();
bool tags_entry_left (GdkEventFocus* event);
void tags_changed ();
void save_tags (const std::vector<std::string>&);
void stop_audition ();
+ bool seek_button_press(GdkEventButton*);
+ bool seek_button_release(GdkEventButton*);
+ bool _seeking;
+ ARDOUR::SrcQuality _src_quality;
+ Editing::ImportPosition _import_position;
};
};
-class SoundFileBrowser : public Ardour
Dialog
+class SoundFileBrowser : public Ardour
Window
{
private:
class FoundTagColumns : public Gtk::TreeModel::ColumnRecord
{
private:
class FoundTagColumns : public Gtk::TreeModel::ColumnRecord
@@
-128,12
+142,20
@@
class SoundFileBrowser : public ArdourDialog
Gtk::TreeModelColumn<std::string> uri;
Gtk::TreeModelColumn<std::string> filename;
Gtk::TreeModelColumn<std::string> duration;
Gtk::TreeModelColumn<std::string> uri;
Gtk::TreeModelColumn<std::string> filename;
Gtk::TreeModelColumn<std::string> duration;
+ Gtk::TreeModelColumn<std::string> filesize;
+ Gtk::TreeModelColumn<std::string> smplrate;
+ Gtk::TreeModelColumn<std::string> license;
+ Gtk::TreeModelColumn<bool> started;
FreesoundColumns() {
FreesoundColumns() {
- add(id);
- add(filename);
+ add(id);
+ add(filename);
add(uri);
add(duration);
add(uri);
add(duration);
+ add(filesize);
+ add(smplrate);
+ add(license);
+ add(started);
}
};
}
};
@@
-143,12
+165,17
@@
class SoundFileBrowser : public ArdourDialog
FreesoundColumns freesound_list_columns;
Glib::RefPtr<Gtk::ListStore> freesound_list;
FreesoundColumns freesound_list_columns;
Glib::RefPtr<Gtk::ListStore> freesound_list;
- Gtk::Button freesound_stop_btn;
+ Gtk::Button freesound_more_btn;
+ Gtk::Button freesound_similar_btn;
+ void handle_freesound_results(std::string theString);
public:
public:
- SoundFileBrowser (
Gtk::Window& parent,
std::string title, ARDOUR::Session* _s, bool persistent);
+ SoundFileBrowser (std::string title, ARDOUR::Session* _s, bool persistent);
virtual ~SoundFileBrowser ();
virtual ~SoundFileBrowser ();
+ int run ();
+ int status () const { return _status; }
+
virtual void set_session (ARDOUR::Session*);
std::vector<std::string> get_paths ();
virtual void set_session (ARDOUR::Session*);
std::vector<std::string> get_paths ();
@@
-164,23
+191,19
@@
class SoundFileBrowser : public ArdourDialog
Gtk::Entry freesound_entry;
Gtk::ComboBoxText freesound_sort;
Gtk::Entry freesound_entry;
Gtk::ComboBoxText freesound_sort;
- Gtk::SpinButton freesound_page;
-
+
Gtk::Button freesound_search_btn;
Gtk::TreeView freesound_list_view;
Gtk::Button freesound_search_btn;
Gtk::TreeView freesound_list_view;
- Gtk::ProgressBar freesound_progress_bar;
-
- bool freesound_search_cancel;
- bool freesound_download_cancel;
+ Gtk::Notebook notebook;
void freesound_search();
void freesound_search();
-
-#ifdef FREESOUND
- Mootcher *mootcher;
-#endif
+ void refresh_display(std::string ID, std::string file);
protected:
bool resetting_ourselves;
protected:
bool resetting_ourselves;
+ int matches;
+ int _status;
+ bool _done;
Gtk::FileFilter audio_and_midi_filter;
Gtk::FileFilter audio_filter;
Gtk::FileFilter audio_and_midi_filter;
Gtk::FileFilter audio_filter;
@@
-188,10
+211,12
@@
class SoundFileBrowser : public ArdourDialog
Gtk::FileFilter custom_filter;
Gtk::FileFilter matchall_filter;
Gtk::HBox hpacker;
Gtk::FileFilter custom_filter;
Gtk::FileFilter matchall_filter;
Gtk::HBox hpacker;
+ Gtk::VBox vpacker;
- static std::string persistent_folder;
+ Gtk::Button import_button;
+ Gtk::Button close_button;
-
Gtk::Notebook notebook
;
+
static std::string persistent_folder
;
GainMeter* gm;
Gtk::VBox meter_packer;
GainMeter* gm;
Gtk::VBox meter_packer;
@@
-211,25
+236,30
@@
class SoundFileBrowser : public ArdourDialog
void freesound_list_view_selected ();
void freesound_list_view_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*);
void freesound_search_clicked ();
void freesound_list_view_selected ();
void freesound_list_view_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*);
void freesound_search_clicked ();
- void freesound_stop_clicked ();
-
+ void freesound_more_clicked ();
+ void freesound_similar_clicked ();
+ int freesound_page;
+
void chooser_file_activated ();
void chooser_file_activated ();
+ std::string freesound_get_audio_file(Gtk::TreeIter iter);
bool on_audio_filter (const Gtk::FileFilter::Info& filter_info);
bool on_midi_filter (const Gtk::FileFilter::Info& filter_info);
bool on_audio_and_midi_filter (const Gtk::FileFilter::Info& filter_info);
bool on_audio_filter (const Gtk::FileFilter::Info& filter_info);
bool on_midi_filter (const Gtk::FileFilter::Info& filter_info);
bool on_audio_and_midi_filter (const Gtk::FileFilter::Info& filter_info);
- virtual bool reset_options() { return true; }
+ void set_action_sensitive (bool);
+
+ virtual bool reset_options () { return true; }
protected:
void on_show();
protected:
void on_show();
-
+ virtual void do_something(int action);
};
class SoundFileChooser : public SoundFileBrowser
{
public:
};
class SoundFileChooser : public SoundFileBrowser
{
public:
- SoundFileChooser (
Gtk::Window& parent,
std::string title, ARDOUR::Session* _s = 0);
+ SoundFileChooser (std::string title, ARDOUR::Session* _s = 0);
virtual ~SoundFileChooser () {};
std::string get_filename ();
virtual ~SoundFileChooser () {};
std::string get_filename ();
@@
-242,7
+272,7
@@
class SoundFileOmega : public SoundFileBrowser
{
public:
{
public:
- SoundFileOmega (
Gtk::Window& parent, std::string title, ARDOUR::Session* _s,
+ SoundFileOmega (
std::string title, ARDOUR::Session* _s,
uint32_t selected_audio_tracks, uint32_t selected_midi_tracks,
bool persistent,
Editing::ImportMode mode_hint = Editing::ImportAsTrack);
uint32_t selected_audio_tracks, uint32_t selected_midi_tracks,
bool persistent,
Editing::ImportMode mode_hint = Editing::ImportAsTrack);
@@
-253,6
+283,7
@@
class SoundFileOmega : public SoundFileBrowser
Gtk::ComboBoxText where_combo;
Gtk::ComboBoxText channel_combo;
Gtk::ComboBoxText src_combo;
Gtk::ComboBoxText where_combo;
Gtk::ComboBoxText channel_combo;
Gtk::ComboBoxText src_combo;
+ InstrumentSelector instrument_combo;
Gtk::CheckButton copy_files_btn;
Gtk::CheckButton copy_files_btn;
@@
-272,7
+303,7
@@
class SoundFileOmega : public SoundFileBrowser
typedef std::map<std::string,Editing::ImportDisposition> DispositionMap;
DispositionMap disposition_map;
typedef std::map<std::string,Editing::ImportDisposition> DispositionMap;
DispositionMap disposition_map;
- Gtk::
HBox
options;
+ Gtk::
Table
options;
Gtk::VBox block_two;
Gtk::VBox block_three;
Gtk::VBox block_four;
Gtk::VBox block_two;
Gtk::VBox block_three;
Gtk::VBox block_four;
@@
-286,6
+317,13
@@
class SoundFileOmega : public SoundFileBrowser
bool reset_options ();
void reset_options_noret ();
bool bad_file_message ();
bool reset_options ();
void reset_options_noret ();
bool bad_file_message ();
+ void src_combo_changed ();
+ void where_combo_changed ();
+
+ void do_something (int action);
+
+ bool _import_active;
+ bool _reset_post_import;
};
#endif // __ardour_sfdb_ui_h__
};
#endif // __ardour_sfdb_ui_h__