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

avoid name-conflict

Browse source 
when compiled with -rdynamic, "AudioStream" symbol
conflicts with AspectVST.so
This commit is contained in:
Robin Gareus 2013-06-14 13:49:07 +02:00
parent 80a13145f3
commit 748de7e794
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/transcode_ffmpeg.cc
View file

@ -211,7 +211,7 @@ TranscodeFfmpeg::probe ()
} }
} else if (i->at(5) == X_("codec_type=audio")) { /* new ffprobe */ } else if (i->at(5) == X_("codec_type=audio")) { /* new ffprobe */
AudioStream as; FFAudioStream as;
for (std::vector<std::string>::iterator kv = i->begin(); kv != i->end(); ++kv) { for (std::vector<std::string>::iterator kv = i->begin(); kv != i->end(); ++kv) {
const size_t kvsep = kv->find('='); const size_t kvsep = kv->find('=');
if(kvsep == std::string::npos) continue; if(kvsep == std::string::npos) continue;

4
gtk2_ardour/transcode_ffmpeg.h
View file

@ -25,12 +25,12 @@
#include "system_exec.h" #include "system_exec.h"
/* TODO: use a namespace here ? */ /* TODO: use a namespace here ? */
struct AudioStream { struct FFAudioStream {
std::string name; std::string name;
std::string stream_id; std::string stream_id;
uint32_t channels; uint32_t channels;
}; };
typedef std::vector<AudioStream> AudioStreams; typedef std::vector<FFAudioStream> AudioStreams;
typedef std::map<std::string,std::string> FFSettings; typedef std::map<std::string,std::string> FFSettings;
/** @class TranscodeFfmpeg /** @class TranscodeFfmpeg