mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-10 08:36:32 +01:00
pulling trunk
git-svn-id: svn://localhost/ardour2/branches/undo@586 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
3038d8ce4a
commit
eb3f77df57
237 changed files with 68673 additions and 4051 deletions
|
|
@ -90,6 +90,7 @@ using namespace Gtkmm2ext;
|
|||
using namespace Editing;
|
||||
|
||||
using PBD::internationalize;
|
||||
using PBD::atoi;
|
||||
|
||||
const double Editor::timebar_height = 15.0;
|
||||
|
||||
|
|
@ -2191,7 +2192,7 @@ Editor::set_state (const XMLNode& node)
|
|||
}
|
||||
|
||||
if ((prop = node.property ("zoom"))) {
|
||||
set_frames_per_unit (atof (prop->value()));
|
||||
set_frames_per_unit (PBD::atof (prop->value()));
|
||||
}
|
||||
|
||||
if ((prop = node.property ("snap-to"))) {
|
||||
|
|
@ -2899,7 +2900,7 @@ Editor::convert_drop_to_paths (vector<ustring>& paths,
|
|||
for (vector<ustring>::iterator i = uris.begin(); i != uris.end(); ++i) {
|
||||
if ((*i).substr (0,7) == "file://") {
|
||||
string p = *i;
|
||||
url_decode (p);
|
||||
PBD::url_decode (p);
|
||||
paths.push_back (p.substr (7));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue