mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths (may cause issues when loading creatively named 2.X sessions; fix a couple of details of name collection and usage from the startup dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@7772 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
875f0befd5
commit
4d112a8e6b
57 changed files with 563 additions and 474 deletions
|
|
@ -22,6 +22,7 @@
|
|||
#define __export_dialog_h__
|
||||
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
#include <string>
|
||||
|
||||
#include "ardour/export_profile_manager.h"
|
||||
|
||||
|
|
@ -120,8 +121,8 @@ class ExportDialog : public ArdourDialog {
|
|||
Gtk::Button list_files_button;
|
||||
Glib::ustring list_files_string;
|
||||
|
||||
void add_error (Glib::ustring const & text);
|
||||
void add_warning (Glib::ustring const & text);
|
||||
void add_error (std::string const & text);
|
||||
void add_warning (std::string const & text);
|
||||
|
||||
/* Progress bar */
|
||||
|
||||
|
|
@ -140,12 +141,12 @@ class ExportDialog : public ArdourDialog {
|
|||
class ExportRangeDialog : public ExportDialog
|
||||
{
|
||||
public:
|
||||
ExportRangeDialog (PublicEditor & editor, Glib::ustring range_id);
|
||||
ExportRangeDialog (PublicEditor & editor, std::string range_id);
|
||||
|
||||
private:
|
||||
void init_components ();
|
||||
|
||||
Glib::ustring range_id;
|
||||
|
||||
std::string range_id;
|
||||
};
|
||||
|
||||
class ExportSelectionDialog : public ExportDialog
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue