openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Remaining std:: prefixes

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2019-08-04 23:51:02 -04:00
parent 44076854ad
commit 352fd6629a
10 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/MagickUtilities.h
View File

@@ -52,9 +52,9 @@
// IM6: list<Magick::Drawable>
// (both have the push_back() method which is all we use)
#if NEW_MAGICK
#define MAGICK_DRAWABLE vector<Magick::Drawable>
#define MAGICK_DRAWABLE std::vector<Magick::Drawable>
#else
#define MAGICK_DRAWABLE list<Magick::Drawable>
#define MAGICK_DRAWABLE std::list<Magick::Drawable>
#endif
#endif

4
include/OpenMPUtilities.h
View File

@@ -38,8 +38,8 @@
#include "Settings.h"
// Calculate the # of OpenMP Threads to allow
#define OPEN_MP_NUM_PROCESSORS (min(omp_get_num_procs(), max(2, openshot::Settings::Instance()->OMP_THREADS) ))
#define FF_NUM_PROCESSORS (min(omp_get_num_procs(), max(2, openshot::Settings::Instance()->FF_THREADS) ))
#define OPEN_MP_NUM_PROCESSORS (std::min(omp_get_num_procs(), std::max(2, openshot::Settings::Instance()->OMP_THREADS) ))
#define FF_NUM_PROCESSORS (std::min(omp_get_num_procs(), std::max(2, openshot::Settings::Instance()->FF_THREADS) ))
#endif

8
include/Qt/AudioPlaybackThread.h
View File

@@ -69,10 +69,10 @@ namespace openshot
public:
/// Error found during JUCE initialise method
string initialise_error;
std::string initialise_error;
/// List of valid audio device names
vector<AudioDeviceInfo> audio_device_names;
std::vector<AudioDeviceInfo> audio_device_names;
/// Override with no channels and no preferred audio device
static AudioDeviceManagerSingleton * Instance();
@@ -134,10 +134,10 @@ namespace openshot
int getSpeed() const { if (source) return source->getSpeed(); else return 1; }
/// Get Audio Error (if any)
string getError() { return AudioDeviceManagerSingleton::Instance()->initialise_error; }
std::string getError() { return AudioDeviceManagerSingleton::Instance()->initialise_error; }
/// Get Audio Device Names (if any)
vector<AudioDeviceInfo> getAudioDeviceNames() { return AudioDeviceManagerSingleton::Instance()->audio_device_names; };
std::vector<AudioDeviceInfo> getAudioDeviceNames() { return AudioDeviceManagerSingleton::Instance()->audio_device_names; };
friend class PlayerPrivate;
friend class QtPlayer;

2
include/Timeline.h
View File

@@ -238,7 +238,7 @@ namespace openshot {
void Close();
/// Return the list of effects on the timeline
list<EffectBase*> Effects() { return effects; };
std::list<EffectBase*> Effects() { return effects; };
/// Get the cache object used by this reader
CacheBase* GetCache() { return final_cache; };