smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

Move 'poor_mans_glob()' into libpbd

Browse source
This commit is contained in:
John Emmas 2015-03-09 18:29:26 +00:00
parent e525b169f2
commit 523f703b3b
6 changed files with 14 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/option_editor.cc
View file

@ -41,13 +41,6 @@ using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
using namespace ARDOUR; using namespace ARDOUR;
static string poor_mans_glob (string path)
{
string copy = path;
replace_all (copy, "~", Glib::get_home_dir());
return copy;
}
void void
OptionEditorComponent::add_widget_to_page (OptionEditorPage* p, Gtk::Widget* w) OptionEditorComponent::add_widget_to_page (OptionEditorPage* p, Gtk::Widget* w)
{ {

7
gtk2_ardour/session_dialog.cc
View file

@ -57,13 +57,6 @@ using namespace PBD;
using namespace ARDOUR; using namespace ARDOUR;
using namespace ARDOUR_UI_UTILS; using namespace ARDOUR_UI_UTILS;
static string poor_mans_glob (string path)
{
string copy = path;
replace_all (copy, "~", Glib::get_home_dir());
return copy;
}
SessionDialog::SessionDialog (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name, bool cancel_not_quit) SessionDialog::SessionDialog (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name, bool cancel_not_quit)
: ArdourDialog (_("Session Setup"), true, true) : ArdourDialog (_("Session Setup"), true, true)
, new_only (require_new) , new_only (require_new)

7
gtk2_ardour/startup.cc
View file

@ -60,13 +60,6 @@ using namespace ARDOUR_UI_UTILS;
ArdourStartup* ArdourStartup::the_startup = 0; ArdourStartup* ArdourStartup::the_startup = 0;
static string poor_mans_glob (string path)
{
string copy = path;
replace_all (copy, "~", Glib::get_home_dir());
return copy;
}
ArdourStartup::ArdourStartup () ArdourStartup::ArdourStartup ()
: _response (RESPONSE_OK) : _response (RESPONSE_OK)
, config_modified (false) , config_modified (false)

4
libs/pbd/MSVCpbd/pbd.vcproj
View file

@ -752,6 +752,10 @@
RelativePath="..\pbd\receiver.h" RelativePath="..\pbd\receiver.h"
> >
</File> </File>
<File
RelativePath="..\pbd\replace_all.h"
>
</File>
<File <File
RelativePath="..\pbd\resource.h" RelativePath="..\pbd\resource.h"
> >

1
libs/pbd/pbd/replace_all.h
View file

@ -25,5 +25,6 @@
#include "pbd/libpbd_visibility.h" #include "pbd/libpbd_visibility.h"
LIBPBD_API int replace_all (std::string& str, const std::string& target, const std::string& replacement); LIBPBD_API int replace_all (std::string& str, const std::string& target, const std::string& replacement);
LIBPBD_API std::string poor_mans_glob (std::string path);
#endif // __pbd_replace_all_h__ #endif // __pbd_replace_all_h__

9
libs/pbd/strreplace.cc
View file

@ -18,6 +18,7 @@
*/ */
#include "pbd/replace_all.h" #include "pbd/replace_all.h"
#include "glibmm/miscutils.h"
int int
replace_all (std::string& str, replace_all (std::string& str,
@ -36,3 +37,11 @@ replace_all (std::string& str,
return cnt; return cnt;
} }
std::string
poor_mans_glob (std::string path)
{
std::string copy = path;
replace_all (copy, "~", Glib::get_home_dir());
return copy;
}