Merge pull request #169 from arnefmeyer/development

add juce namespace to (u)int64 types

Author: jsiegle

Source/CoreServices.cpp

@@ -78,12 +78,12 @@ void highlightEditor(GenericEditor* ed)
     getEditorViewport()->makeEditorVisible(ed);
 }
 
-int64 getGlobalTimestamp()
+juce::int64 getGlobalTimestamp()
 {
 	return getProcessorGraph()->getGlobalTimestamp(false);
 }
 
-int64 getSoftwareTimestamp()
+juce::int64 getSoftwareTimestamp()
 {
 	return getProcessorGraph()->getGlobalTimestamp(true);
 }
@@ -191,4 +191,4 @@ String getGUIVersion()
 	return STR_DEF(JUCE_APP_VERSION);
 }
 
-};
+};

Source/CoreServices.h

@@ -61,15 +61,15 @@ PLUGIN_API void highlightEditor(GenericEditor* ed);
 /** Gets the timestamp selected on the MessageCenter interface
 Defaults to the first hardware timestamp source or the software one if
 no hardware timestamping is present*/
-PLUGIN_API int64 getGlobalTimestamp();
+PLUGIN_API juce::int64 getGlobalTimestamp();
 
 /** Gets the sample rate selected on the MessageCenter interface
 Defaults to the dample rate of the first hardware source or 
 the software high resolution timer if no hardware source is present*/
 PLUGIN_API float getGlobalSampleRate();
 
 /** Gets the software timestamp based on a high resolution timer aligned to the start of each processing block */
-PLUGIN_API int64 getSoftwareTimestamp();
+PLUGIN_API juce::int64 getSoftwareTimestamp();
 
 /** Gets the ticker frequency of the software timestamp clock*/
 PLUGIN_API float getSoftwareSampleRate();