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

'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead

Browse source
This commit is contained in:
John Emmas 2013-10-14 17:05:42 +01:00
parent 5568026387
commit 8a4a86eff4
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/ardour_ui.cc
View file

@ -27,7 +27,7 @@
#include <cerrno>
#include <fstream>
#ifndef WIN32
#ifndef PLATFORM_WINDOWS
#include <sys/resource.h>
#endif
@ -834,7 +834,7 @@ ARDOUR_UI::no_memory_warning ()
void
ARDOUR_UI::check_memory_locking ()
{
#if defined(__APPLE__) || defined(WIN32)
#if defined(__APPLE__) || defined(PLATFORM_WINDOWS)
/* OS X doesn't support mlockall(2), and so testing for memory locking capability there is pointless */
return;
#else // !__APPLE__
@ -3367,7 +3367,7 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg)
warning << _("Specified docroot is not an existing directory.") << endmsg;
continue;
}
#ifndef WIN32
#ifndef PLATFORM_WINDOWS
if ( (!g_lstat (icsd_exec.c_str(), &sb) == 0)
|| (sb.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) == 0 ) {
warning << _("Given Video Server is not an executable file.") << endmsg;
@ -3816,7 +3816,7 @@ ARDOUR_UI::reconnect_to_engine ()
{
if (AudioEngine::instance()->start ()) {
MessageDialog msg (*editor, _("Could not reconnect to the Audio/MIDI engine"));
msg.run ();
msg.run ();
return -1;
}

6
gtk2_ardour/audio_region_editor.cc
View file

@ -54,7 +54,7 @@ AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion>
: RegionEditor (s, r)
, _audio_region (r)
, gain_adjustment(accurate_coefficient_to_dB(_audio_region->scale_amplitude()), -40.0, +40.0, 0.1, 1.0, 0)
#ifndef WIN32
#ifndef PLATFORM_WINDOWS
, _peak_channel (false)
#endif
{
@ -138,7 +138,7 @@ AudioRegionEditor::gain_adjustment_changed ()
void
AudioRegionEditor::signal_peak_thread ()
{
#ifdef WIN32
#ifdef PLATFORM_WINDOWS
m_peak_sem.post ();
#else
_peak_channel.deliver ('c');
@ -148,7 +148,7 @@ AudioRegionEditor::signal_peak_thread ()
void
AudioRegionEditor::wait_for_signal ()
{
#ifdef WIN32
#ifdef PLATFORM_WINDOWS
m_peak_sem.wait ();
#else
char msg;

4
gtk2_ardour/audio_region_editor.h
View file

@ -36,7 +36,7 @@
#include "pbd/signals.h"
#ifdef WIN32
#ifdef PLATFORM_WINDOWS
#include "pbd/glib_semaphore.h"
#else
#include "pbd/crossthread.h"
@ -83,7 +83,7 @@ class AudioRegionEditor : public RegionEditor
void peak_amplitude_found (double);
PBD::Signal1<void, double> PeakAmplitudeFound;
PBD::ScopedConnection _peak_amplitude_connection;
#ifdef WIN32
#ifdef PLATFORM_WINDOWS
PBD::GlibSemaphore m_peak_sem;
#else
CrossThreadChannel _peak_channel;