projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modify Mackie surface code to use crossthreadchannel on all platforms
[ardour.git]
/
gtk2_ardour
/
export_format_selector.h
diff --git
a/gtk2_ardour/export_format_selector.h
b/gtk2_ardour/export_format_selector.h
index 6e1dd527869a2f34a05ea42cea26d37b01d44bf2..4af647ac9c8e8355f57b29df142e0778a5465ba9 100644
(file)
--- a/
gtk2_ardour/export_format_selector.h
+++ b/
gtk2_ardour/export_format_selector.h
@@
-21,12
+21,12
@@
#ifndef __export_format_selector_h__
#define __export_format_selector_h__
#ifndef __export_format_selector_h__
#define __export_format_selector_h__
-#include "ardour/export_profile_manager.h"
-
+#include <string>
#include <gtkmm.h>
#include <sigc++/signal.h>
#include <boost/shared_ptr.hpp>
#include <gtkmm.h>
#include <sigc++/signal.h>
#include <boost/shared_ptr.hpp>
+#include "ardour/export_profile_manager.h"
#include "ardour/session_handle.h"
namespace ARDOUR {
#include "ardour/session_handle.h"
namespace ARDOUR {
@@
-63,7
+63,7
@@
class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void select_format (FormatPtr f);
void add_new_format ();
void select_format (FormatPtr f);
void add_new_format ();
- void remove_format ();
+ void remove_format (
bool called_from_button = false
);
int open_edit_dialog (bool new_dialog = false);
void update_format_combo ();
void update_format_description ();
int open_edit_dialog (bool new_dialog = false);
void update_format_combo ();
void update_format_description ();
@@
-76,7
+76,7
@@
class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
{
public:
Gtk::TreeModelColumn<FormatPtr> format;
{
public:
Gtk::TreeModelColumn<FormatPtr> format;
- Gtk::TreeModelColumn<
Glib::u
string> label;
+ Gtk::TreeModelColumn<
std::
string> label;
FormatCols () { add (format); add (label); }
};
FormatCols () { add (format); add (label); }
};