Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: xbmc/xbmc
...
head fork: xbmc/xbmc
Checking mergeability… Don't worry, you can still create the pull request.
  • 6 commits
  • 11 files changed
  • 0 commit comments
  • 2 contributors
View
6 xbmc/cores/AudioEngine/AEFactory.cpp
@@ -48,9 +48,8 @@ bool CAEFactory::LoadEngine()
bool loaded = false;
- std::string engine;
-
#if defined(TARGET_LINUX)
+ std::string engine;
if (getenv("AE_ENGINE"))
{
engine = (std::string)getenv("AE_ENGINE");
@@ -203,9 +202,8 @@ void CAEFactory::VerifyOutputDevice(std::string &device, bool passthrough)
EnumerateOutputDevices(devices, passthrough);
std::string firstDevice;
- for (AEDeviceList::const_iterator deviceIt = devices.begin(); deviceIt != devices.end(); deviceIt++)
+ for (AEDeviceList::const_iterator deviceIt = devices.begin(); deviceIt != devices.end(); ++deviceIt)
{
- std::string currentDevice = deviceIt->second;
/* remember the first device so we can default to it if required */
if (firstDevice.empty())
firstDevice = deviceIt->second;
View
8 xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp
@@ -29,7 +29,13 @@
#include <string.h>
CAEEncoderFFmpeg::CAEEncoderFFmpeg():
- m_CodecCtx(NULL)
+ m_CodecCtx (NULL ),
+ m_BitRate (0 ),
+ m_BufferSize (0 ),
+ m_OutputSize (0 ),
+ m_OutputRatio (0.0 ),
+ m_SampleRateMul (0.0 ),
+ m_NeededFrames (0 )
{
}
View
3  xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEHALIOS.cpp
@@ -1103,7 +1103,8 @@ m_allowMixing (false ),
m_encoded (false ),
m_initVolume (1.0f ),
m_NumLatencyFrames (0 ),
-m_OutputBufferIndex (0 )
+m_OutputBufferIndex (0 ),
+m_ae (NULL )
{
}
View
3  xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEHALOSX.cpp
@@ -45,7 +45,8 @@ CCoreAudioAEHALOSX::CCoreAudioAEHALOSX() :
m_encoded (false ),
m_initVolume (1.0f ),
m_NumLatencyFrames (0 ),
- m_OutputBufferIndex (0 )
+ m_OutputBufferIndex (0 ),
+ m_ae (NULL )
{
m_AudioDevice = new CCoreAudioDevice();
m_OutputStream = new CCoreAudioStream();
View
4 xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioMixMap.cpp
@@ -58,12 +58,12 @@ void CCoreAudioMixMap::Rebuild(AudioChannelLayout& inLayout, AudioChannelLayout&
// Try to find a 'well-known' matrix
const AudioChannelLayout* layouts[] = {&inLayout, &outLayout};
UInt32 propSize = 0;
- OSStatus ret = AudioFormatGetPropertyInfo(kAudioFormatProperty_MatrixMixMap,
+ AudioFormatGetPropertyInfo(kAudioFormatProperty_MatrixMixMap,
sizeof(layouts), layouts, &propSize);
m_pMap = (Float32*)calloc(1,propSize);
// Try and get a predefined mixmap
- ret = AudioFormatGetProperty(kAudioFormatProperty_MatrixMixMap,
+ OSStatus ret = AudioFormatGetProperty(kAudioFormatProperty_MatrixMixMap,
sizeof(layouts), layouts, &propSize, m_pMap);
if (!ret)
{
View
2  xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioRingBuffer.h
@@ -156,7 +156,7 @@ class CoreAudioRingBuffer {
unsigned int space = GetReadSize();
//want to read more than we have written?
- if( space <= 0 )
+ if( space == 0 )
{
#ifdef RING_BUFFER_DEBUG
CLog::Log(LOGDEBUG, "CoereAudioRingBuffer: Can't read from empty buffer.");
View
1  xbmc/cores/AudioEngine/Engines/PulseAE/PulseAE.cpp
@@ -81,6 +81,7 @@ CPulseAE::CPulseAE()
m_Context = NULL;
m_MainLoop = NULL;
m_muted = false;
+ m_Volume = 0.0f;
}
CPulseAE::~CPulseAE()
View
6 xbmc/cores/AudioEngine/Engines/PulseAE/PulseAESound.cpp
@@ -34,9 +34,11 @@ CPulseAESound::CPulseAESound(const std::string &filename, pa_context *context, p
m_context (context ),
m_mainLoop (mainLoop),
m_stream (NULL ),
- m_op (NULL )
+ m_op (NULL ),
+ m_maxVolume (0.0f ),
+ m_volume (0.0f ),
+ m_pulseName (StringUtils::CreateUUID())
{
- m_pulseName = StringUtils::CreateUUID();
m_wavLoader.Load(filename);
}
View
6 xbmc/cores/AudioEngine/Engines/SoftAE/SoftAESound.cpp
@@ -34,12 +34,6 @@
/* typecast AE to CSoftAE */
#define AE (*((CSoftAE*)CAEFactory::GetEngine()))
-typedef struct
-{
- char chunk_id[4];
- uint32_t chunksize;
-} WAVE_CHUNK;
-
CSoftAESound::CSoftAESound(const std::string &filename) :
IAESound (filename),
m_filename (filename),
View
1  xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp
@@ -239,6 +239,7 @@ CAEChannelInfo::operator std::string()
const char* CAEChannelInfo::GetChName(const enum AEChannel ch)
{
+ // Logical disjunction always evaluates to true: ch >= 0 || ch < 29.
ASSERT(ch >= 0 || ch < AE_CH_MAX);
static const char* channels[AE_CH_MAX] =
View
2  xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
@@ -102,7 +102,6 @@ int CAEStreamInfo::AddData(uint8_t *data, unsigned int size, uint8_t **buffer/*
return 0;
}
- unsigned int consumed = 0;
if (m_skipBytes)
{
unsigned int canSkip = std::min(size, m_skipBytes);
@@ -125,6 +124,7 @@ int CAEStreamInfo::AddData(uint8_t *data, unsigned int size, uint8_t **buffer/*
}
else
{
+ unsigned int consumed = 0;
unsigned int offset = 0;
unsigned int room = sizeof(m_buffer) - m_bufferSize;
while(1)

No commit comments for this range

Something went wrong with that request. Please try again.