Merge branch 'windows' into windows+cc

[ardour.git] / gtk2_ardour / ardour_ui.cc

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 8205290590f6b3a0b42d3837f0c19cfd10935a1e..27de9d59237e15dd637a5bb80fa7e078b23a447c 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -743,14 +743,14 @@ ARDOUR_UI::starting ()
                        // wait for announce reply from nsm server
                        for ( i = 0; i < 5000; ++i) {
                                nsm->check ();
-                               usleep (i);
+                               Glib::usleep (i);
                                if (nsm->is_active())
                                        break;
                        }
                        // wait for open command from nsm server
                        for ( i = 0; i < 5000; ++i) {
                                nsm->check ();
-                               usleep (1000);
+                               Glib::usleep (1000);
                                if (nsm->client_id ())
                                        break;
                        }
@@ -3065,13 +3065,13 @@ require some unused files to continue to exist."));
                space_adjusted = rep.space;
        } else if (rep.space < 1000000) {
                bprefix = _("kilo");
-               space_adjusted = truncf((float)rep.space / 1000.0);
+               space_adjusted = floorf((float)rep.space / 1000.0);
        } else if (rep.space < 1000000 * 1000) {
                bprefix = _("mega");
-               space_adjusted = truncf((float)rep.space / (1000.0 * 1000.0));
+               space_adjusted = floorf((float)rep.space / (1000.0 * 1000.0));
        } else {
                bprefix = _("giga");
-               space_adjusted = truncf((float)rep.space / (1000.0 * 1000 * 1000.0));
+               space_adjusted = floorf((float)rep.space / (1000.0 * 1000 * 1000.0));
        }
 
        if (msg_delete) {
@@ -3362,7 +3362,7 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg)
                std::string icsd_docroot = video_server_dialog->get_docroot();
                if (icsd_docroot.empty()) {icsd_docroot = X_("/");}
 
-               struct stat sb;
+               GStatBuf sb;
                if (!g_lstat (icsd_docroot.c_str(), &sb) == 0 || !S_ISDIR(sb.st_mode)) {
                        warning << _("Specified docroot is not an existing directory.") << endmsg;
                        continue;
@@ -3415,7 +3415,7 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg)
                }
                int timeout = 120; // 6 sec
                while (!ARDOUR_UI::instance()->video_timeline->check_server()) {
-                       usleep (50000);
+                       Glib::usleep (50000);
                        if (--timeout <= 0 || !video_server_process->is_running()) break;
                }
                if (timeout <= 0) {