diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-05-19 17:19:43 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-05-19 17:19:43 -0400 |
| commit | 0de7c8920b57e9af99597affb1b18e3435fc1f67 (patch) | |
| tree | 12b106dd005b6b98a4d8feecfc9e742d59ac665a /gtk2_ardour | |
| parent | 5399425f534e2d96d07cf29f427bfa0f39d904b7 (diff) | |
| parent | 6bf8249b4b14c54f53bdfc96b0dc3025a6eaebb6 (diff) | |
Merge branch 'mingw-updates' of https://github.com/mojofunk/ardour into cairocanvas
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/add_video_dialog.h | 4 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/editor_timefx.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/video_server_dialog.cc | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/gtk2_ardour/add_video_dialog.h b/gtk2_ardour/add_video_dialog.h index 203df3ad3d..3d5ff54030 100644 --- a/gtk2_ardour/add_video_dialog.h +++ b/gtk2_ardour/add_video_dialog.h @@ -22,6 +22,10 @@ #include <string> +#ifdef interface +#undef interface +#endif + #include <gtkmm.h> #include "ardour/types.h" diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 35dbe3cfc9..6fef5b94e4 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -28,10 +28,6 @@ #include "ardour/profile.h" #include "ardour/session.h" -#ifdef interface -#undef interface -#endif - #include "actions.h" #include "add_route_dialog.h" #include "add_video_dialog.h" diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index 2528c823b7..765030507b 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/gtk2_ardour/editor_timefx.cc @@ -403,7 +403,7 @@ Editor::timefx_thread (void *arg) */ #ifdef PLATFORM_WINDOWS - Sleep(2000); + Glib::usleep(2 * G_USEC_PER_SEC); #else struct timespec t = { 2, 0 }; nanosleep (&t, 0); diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc index e4c9a7f51a..6d9bb22978 100644 --- a/gtk2_ardour/video_server_dialog.cc +++ b/gtk2_ardour/video_server_dialog.cc @@ -43,6 +43,10 @@ #include "utils_videotl.h" #include "i18n.h" +#ifdef PLATFORM_WINDOWS +#include <windows.h> +#endif + using namespace Gtk; using namespace std; using namespace PBD; |