projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix size of "off" state for audio frames clock mode
[ardour.git]
/
gtk2_ardour
/
sfdb_ui.h
diff --git
a/gtk2_ardour/sfdb_ui.h
b/gtk2_ardour/sfdb_ui.h
index 6565178bc65a3672e59b9dfd079875926ef15ebd..4a4bdf9c7d2aa84de8fd85493c54f6fec4c11047 100644
(file)
--- a/
gtk2_ardour/sfdb_ui.h
+++ b/
gtk2_ardour/sfdb_ui.h
@@
-23,7
+23,6
@@
#include <string>
#include <vector>
#include <map>
#include <string>
#include <vector>
#include <map>
-#include <glibmm/ustring.h>
#include <sigc++/signal.h>
#include <sigc++/signal.h>
@@
-36,12
+35,14
@@
#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/textview.h>
-#include
<ardour/session.h>
-#include
<ardour/audiofilesource.h>
+#include
"ardour/audiofilesource.h"
+#include
"ardour/session_handle.h"
#include "ardour_dialog.h"
#include "editing.h"
#include "ardour_dialog.h"
#include "editing.h"
+#include "audio_clock.h"
namespace ARDOUR {
class Session;
namespace ARDOUR {
class Session;
@@
-49,27
+50,26
@@
namespace ARDOUR {
class GainMeter;
class GainMeter;
-class SoundFileBox : public Gtk::VBox
+class SoundFileBox : public Gtk::VBox
, public ARDOUR::SessionHandlePtr
{
public:
SoundFileBox (bool persistent);
virtual ~SoundFileBox () {};
{
public:
SoundFileBox (bool persistent);
virtual ~SoundFileBox () {};
-
+
void set_session (ARDOUR::Session* s);
void set_session (ARDOUR::Session* s);
- bool setup_labels (const
Glib::u
string& filename);
+ bool setup_labels (const
std::
string& filename);
void audition();
bool audition_oneshot();
bool autoplay () const;
protected:
void audition();
bool audition_oneshot();
bool autoplay () const;
protected:
- ARDOUR::Session* _session;
- Glib::ustring path;
-
+ std::string path;
+
ARDOUR::SoundFileInfo sf_info;
ARDOUR::SoundFileInfo sf_info;
-
+
Gtk::Table table;
Gtk::Table table;
-
+
Gtk::Label length;
Gtk::Label format;
Gtk::Label channels;
Gtk::Label length;
Gtk::Label format;
Gtk::Label channels;
@@
-78,7
+78,7
@@
class SoundFileBox : public Gtk::VBox
Gtk::Label channels_value;
Gtk::Label samplerate_value;
Gtk::Label channels_value;
Gtk::Label samplerate_value;
-
+
Gtk::Label format_text;
AudioClock length_clock;
AudioClock timecode_clock;
Gtk::Label format_text;
AudioClock length_clock;
AudioClock timecode_clock;
@@
-87,11
+87,11
@@
class SoundFileBox : public Gtk::VBox
Gtk::Label preview_label;
Gtk::TextView tags_entry;
Gtk::Label preview_label;
Gtk::TextView tags_entry;
-
+
Gtk::VBox main_box;
Gtk::VBox path_box;
Gtk::HBox bottom_box;
Gtk::VBox main_box;
Gtk::VBox path_box;
Gtk::HBox bottom_box;
-
+
Gtk::Button play_btn;
Gtk::Button stop_btn;
Gtk::CheckButton autoplay_btn;
Gtk::Button play_btn;
Gtk::Button stop_btn;
Gtk::CheckButton autoplay_btn;
@@
-109,39
+109,66
@@
class SoundFileBrowser : public ArdourDialog
class FoundTagColumns : public Gtk::TreeModel::ColumnRecord
{
public:
class FoundTagColumns : public Gtk::TreeModel::ColumnRecord
{
public:
- Gtk::TreeModelColumn<
Glib::u
string> pathname;
-
+ Gtk::TreeModelColumn<
std::
string> pathname;
+
FoundTagColumns() { add(pathname); }
};
FoundTagColumns() { add(pathname); }
};
-
+
+ class FreesoundColumns : public Gtk::TreeModel::ColumnRecord
+ {
+ public:
+ Gtk::TreeModelColumn<std::string> id;
+ Gtk::TreeModelColumn<std::string> uri;
+ Gtk::TreeModelColumn<std::string> filename;
+
+ FreesoundColumns() { add(id); add(filename); add(uri); }
+ };
+
FoundTagColumns found_list_columns;
Glib::RefPtr<Gtk::ListStore> found_list;
FoundTagColumns found_list_columns;
Glib::RefPtr<Gtk::ListStore> found_list;
+ FreesoundColumns freesound_list_columns;
+ Glib::RefPtr<Gtk::ListStore> freesound_list;
+
+ Gtk::ProgressBar progress_bar;
+
public:
SoundFileBrowser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s, bool persistent);
virtual ~SoundFileBrowser ();
public:
SoundFileBrowser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s, bool persistent);
virtual ~SoundFileBrowser ();
-
+
virtual void set_session (ARDOUR::Session*);
virtual void set_session (ARDOUR::Session*);
- std::vector<
Glib::u
string> get_paths ();
-
+ std::vector<
std::
string> get_paths ();
+
void clear_selection ();
Gtk::FileChooserWidget chooser;
void clear_selection ();
Gtk::FileChooserWidget chooser;
+
+ SoundFileBox preview;
+
+ Gtk::Entry found_entry;
+ Gtk::Button found_search_btn;
Gtk::TreeView found_list_view;
Gtk::TreeView found_list_view;
+ Gtk::Entry freesound_entry;
+ Gtk::ComboBoxText freesound_sort;
+ Gtk::SpinButton freesound_page;
+
+ Gtk::Button freesound_search_btn;
+ Gtk::TreeView freesound_list_view;
+
+ void freesound_search();
+
protected:
bool resetting_ourselves;
protected:
bool resetting_ourselves;
-
+
Gtk::FileFilter audio_filter;
Gtk::FileFilter midi_filter;
Gtk::FileFilter audio_filter;
Gtk::FileFilter midi_filter;
+ Gtk::FileFilter custom_filter;
Gtk::FileFilter matchall_filter;
Gtk::FileFilter matchall_filter;
- SoundFileBox preview;
Gtk::HBox hpacker;
Gtk::HBox hpacker;
- static
Glib::u
string persistent_folder;
+ static
std::
string persistent_folder;
- Gtk::Entry found_entry;
- Gtk::Button found_search_btn;
Gtk::Notebook notebook;
GainMeter* gm;
Gtk::Notebook notebook;
GainMeter* gm;
@@
-154,12
+181,17
@@
class SoundFileBrowser : public ArdourDialog
sigc::connection metering_connection;
void update_preview ();
sigc::connection metering_connection;
void update_preview ();
+
void found_list_view_selected ();
void found_list_view_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*);
void found_search_clicked ();
void found_list_view_selected ();
void found_list_view_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*);
void found_search_clicked ();
+ void freesound_list_view_selected ();
+ void freesound_list_view_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*);
+ void freesound_search_clicked ();
+
void chooser_file_activated ();
void chooser_file_activated ();
-
+
bool on_audio_filter (const Gtk::FileFilter::Info& filter_info);
bool on_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);
@@
-175,8
+207,8
@@
class SoundFileChooser : public SoundFileBrowser
public:
SoundFileChooser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s = 0);
virtual ~SoundFileChooser () {};
public:
SoundFileChooser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s = 0);
virtual ~SoundFileChooser () {};
-
-
Glib::u
string get_filename ();
+
+
std::
string get_filename ();
protected:
void on_hide();
protected:
void on_hide();
@@
-186,11
+218,13
@@
class SoundFileOmega : public SoundFileBrowser
{
public:
{
public:
- SoundFileOmega (Gtk::Window& parent, std::string title, ARDOUR::Session* _s, int selected_tracks, bool persistent,
+ SoundFileOmega (Gtk::Window& parent, std::string title, ARDOUR::Session* _s,
+ uint32_t selected_audio_tracks, uint32_t selected_midi_tracks,
+ bool persistent,
Editing::ImportMode mode_hint = Editing::ImportAsTrack);
Editing::ImportMode mode_hint = Editing::ImportAsTrack);
-
- void reset (
int selected
_tracks);
-
+
+ void reset (
uint32_t selected_audio_tracks, uint32_t selected_midi
_tracks);
+
Gtk::ComboBoxText action_combo;
Gtk::ComboBoxText where_combo;
Gtk::ComboBoxText channel_combo;
Gtk::ComboBoxText action_combo;
Gtk::ComboBoxText where_combo;
Gtk::ComboBoxText channel_combo;
@@
-208,9
+242,10
@@
class SoundFileOmega : public SoundFileBrowser
void on_hide();
private:
void on_hide();
private:
- uint32_t selected_track_cnt;
+ uint32_t selected_audio_track_cnt;
+ uint32_t selected_midi_track_cnt;
- typedef std::map<
Glib::u
string,Editing::ImportDisposition> DispositionMap;
+ typedef std::map<
std::
string,Editing::ImportDisposition> DispositionMap;
DispositionMap disposition_map;
Gtk::HBox options;
DispositionMap disposition_map;
Gtk::HBox options;
@@
-218,10
+253,10
@@
class SoundFileOmega : public SoundFileBrowser
Gtk::VBox block_three;
Gtk::VBox block_four;
Gtk::VBox block_three;
Gtk::VBox block_four;
- bool check_info (const std::vector<
Glib::ustring>& paths,
+ bool check_info (const std::vector<
std::string>& paths,
bool& same_size, bool& src_needed, bool& multichannel);
bool& same_size, bool& src_needed, bool& multichannel);
- static bool check_link_status (const ARDOUR::Session
&, const std::vector<Glib::u
string>& paths);
+ static bool check_link_status (const ARDOUR::Session
*, const std::vector<std::
string>& paths);
void file_selection_changed ();
bool reset_options ();
void file_selection_changed ();
bool reset_options ();