From 85aad0f80c0343538501e88b1b030e2ce64c9dad Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Sat, 5 Nov 2022 13:44:10 +0800 Subject: [PATCH 01/13] feature: remove libao dependency and use QAudioSink(QAudioOutput) to play the pcm audio format --- audiooutput.cpp | 187 +++++++++++++++++++++++++++++++++++++++++++++ audiooutput.h | 25 ++++++ config.hh | 2 +- ffmpegaudio.cc | 197 +++++++++++------------------------------------- goldendict.pro | 2 + 5 files changed, 257 insertions(+), 156 deletions(-) create mode 100644 audiooutput.cpp create mode 100644 audiooutput.h diff --git a/audiooutput.cpp b/audiooutput.cpp new file mode 100644 index 00000000..0ebe939d --- /dev/null +++ b/audiooutput.cpp @@ -0,0 +1,187 @@ +#include "audiooutput.h" + +#include +#include +#include +#include +#include +#include +#include +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + #include +#else + #include +#endif +#include +#include + +static QAudioFormat format( int sampleRate, int channelCount ) +{ + QAudioFormat out; + + out.setSampleRate( sampleRate ); + out.setChannelCount( 2 ); +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + out.setByteOrder( QAudioFormat::LittleEndian ); + out.setCodec( QLatin1String( "audio/pcm" ) ); +#endif + +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + out.setSampleSize( 16 ); + out.setSampleType( QAudioFormat::SignedInt ); +#else + out.setSampleFormat( QAudioFormat::Int16 ); +#endif + + + return out; +} + +class AudioOutputPrivate: public QIODevice +{ + public: + AudioOutputPrivate() + { + open( QIODevice::ReadOnly ); + threadPool.setMaxThreadCount( 1 ); + } + + QFuture< void > audioPlayFuture; + +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + using AudioOutput = QAudioOutput; +#else + using AudioOutput = QAudioSink; +#endif + AudioOutput * audioOutput = nullptr; + QByteArray buffer; + qint64 offset = 0; + bool quit = 0; + QMutex mutex; + QWaitCondition cond; + QThreadPool threadPool; + int sampleRate = 0; + int channels = 0; + + void setAudioFormat( int _sampleRate, int _channels ) + { + sampleRate = _sampleRate; + channels = _channels; + } + + qint64 readData( char * data, qint64 len ) override + { + if( !len ) + return 0; + + QMutexLocker locker( &mutex ); + qint64 bytesWritten = 0; + while( len && !quit ) + { + if( buffer.isEmpty() ) + { + // Wait for more frames + if( bytesWritten == 0 ) + cond.wait( &mutex ); + if( buffer.isEmpty() ) + break; + } + + auto sampleData = buffer.data(); + const int toWrite = qMin( (qint64) buffer.size(), len ); + memcpy( &data[bytesWritten], sampleData, toWrite ); + buffer.remove( 0, toWrite ); + bytesWritten += toWrite; + // data += toWrite; + len -= toWrite; + } + + return bytesWritten; + } + + qint64 writeData( const char *, qint64 ) override { return 0; } + qint64 size() const override { return buffer.size(); } + qint64 bytesAvailable() const override { return buffer.size(); } + bool isSequential() const override { return true; } + bool atEnd() const override { return buffer.isEmpty(); } + + void init( const QAudioFormat & fmt ) + { + if( !audioOutput || ( fmt.isValid() && audioOutput->format() != fmt ) + || audioOutput->state() == QAudio::StoppedState ) + { + if( audioOutput ) + audioOutput->deleteLater(); + audioOutput = new AudioOutput( fmt ); + QObject::connect( audioOutput, &AudioOutput::stateChanged, audioOutput, [ & ]( QAudio::State state ) { + switch( state ) + { + case QAudio::StoppedState: + if( audioOutput->error() != QAudio::NoError ) + qWarning() << "QAudioOutput stopped:" << audioOutput->error(); + break; + default: + break; + } + } ); + + audioOutput->start( this ); + } + + // audioOutput->setVolume(volume); + } + + void doPlayAudio() + { + while( !quit ) + { + QMutexLocker locker( &mutex ); + cond.wait( &mutex, 10 ); + auto fmt = sampleRate == 0 ? QAudioFormat() : format( sampleRate, channels ); + locker.unlock(); + if( fmt.isValid() ) + init( fmt ); + QCoreApplication::processEvents(); + } + if( audioOutput ) + { + audioOutput->stop(); + audioOutput->deleteLater(); + } + audioOutput = nullptr; + } +}; + +AudioOutput::AudioOutput( QObject * parent ): QObject( parent ), d_ptr( new AudioOutputPrivate ) +{ +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + d_ptr->audioPlayFuture = QtConcurrent::run( &d_ptr->threadPool, d_ptr.data(), &AudioOutputPrivate::doPlayAudio ); +#else + d_ptr->audioPlayFuture = QtConcurrent::run( &d_ptr->threadPool, &AudioOutputPrivate::doPlayAudio, d_ptr.data() ); +#endif +} + +void AudioOutput::setAudioFormat( int sampleRate, int channels ) { d_ptr->setAudioFormat( sampleRate, channels ); } + +AudioOutput::~AudioOutput() +{ + Q_D( AudioOutput ); + d->quit = true; + d->cond.wakeAll(); + d->audioPlayFuture.waitForFinished(); +} + +bool AudioOutput::play( const uint8_t * data, qint64 len ) +{ + Q_D( AudioOutput ); + if( d->quit ) + return false; + + QMutexLocker locker( &d->mutex ); + auto cuint = const_cast< uint8_t * >( data ); + auto cptr = reinterpret_cast< char * >( cuint ); + d->buffer.append( cptr, len ); + d->cond.wakeAll(); + + return true; +} diff --git a/audiooutput.h b/audiooutput.h new file mode 100644 index 00000000..30ef6f7c --- /dev/null +++ b/audiooutput.h @@ -0,0 +1,25 @@ +#ifndef AUDIOOUTPUT_H +#define AUDIOOUTPUT_H + +#include +#include + +class AudioOutputPrivate; +class AudioOutput: public QObject +{ + public: + AudioOutput( QObject * parent = nullptr ); + ~AudioOutput(); + + bool play( const uint8_t * data, qint64 len ); + void setAudioFormat( int sampleRate, int channels ); + protected: + QScopedPointer< AudioOutputPrivate > d_ptr; + + private: + Q_DISABLE_COPY( AudioOutput ) + Q_DECLARE_PRIVATE( AudioOutput ) +}; + + +#endif // AUDIOOUTPUT_H diff --git a/config.hh b/config.hh index 3a3f01d4..9a4650da 100644 --- a/config.hh +++ b/config.hh @@ -224,7 +224,7 @@ public: private: #ifdef MAKE_FFMPEG_PLAYER static InternalPlayerBackend ffmpeg() - { return InternalPlayerBackend( "FFmpeg+libao" ); } + { return InternalPlayerBackend( "FFmpeg" ); } #endif #ifdef MAKE_QTMULTIMEDIA_PLAYER diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc index 17bafd83..78f2efd6 100644 --- a/ffmpegaudio.cc +++ b/ffmpegaudio.cc @@ -1,20 +1,11 @@ #ifdef MAKE_FFMPEG_PLAYER +#include "audiooutput.h" #include "ffmpegaudio.hh" #include #include -#ifndef INT64_C -#define INT64_C(c) (c ## LL) -#endif - -#ifndef UINT64_C -#define UINT64_C(c) (c ## ULL) -#endif - -#include - extern "C" { #include #include @@ -27,7 +18,11 @@ extern "C" { #include #include +#if( QT_VERSION >= QT_VERSION_CHECK( 6, 2, 0 ) ) + #include + #include +#endif #include "gddebug.hh" #include "utils.hh" @@ -53,13 +48,13 @@ AudioService & AudioService::instance() AudioService::AudioService() { - ao_initialize(); +// ao_initialize(); } AudioService::~AudioService() { emit cancelPlaying( true ); - ao_shutdown(); +// ao_shutdown(); } void AudioService::playMemory( const char * ptr, int size ) @@ -100,7 +95,8 @@ struct DecoderContext AVCodecContext * codecContext_; AVIOContext * avioContext_; AVStream * audioStream_; - ao_device * aoDevice_; +// ao_device * aoDevice_; + AudioOutput * audioOutput; bool avformatOpened_; SwrContext *swr_; @@ -113,7 +109,7 @@ struct DecoderContext bool openOutputDevice( QString & errorString ); void closeOutputDevice(); bool play( QString & errorString ); - bool normalizeAudio( AVFrame * frame, vector & samples ); + bool normalizeAudio( AVFrame * frame, vector & samples ); void playFrame( AVFrame * frame ); }; @@ -126,7 +122,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan codecContext_( NULL ), avioContext_( NULL ), audioStream_( NULL ), - aoDevice_( NULL ), + audioOutput( new AudioOutput ), avformatOpened_( false ), swr_( NULL ) { @@ -243,15 +239,15 @@ bool DecoderContext::openCodec( QString & errorString ) gdDebug( "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name, codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) ); - if ( codecContext_->sample_fmt == AV_SAMPLE_FMT_S32 || - codecContext_->sample_fmt == AV_SAMPLE_FMT_S32P || - codecContext_->sample_fmt == AV_SAMPLE_FMT_FLT || - codecContext_->sample_fmt == AV_SAMPLE_FMT_FLTP || - codecContext_->sample_fmt == AV_SAMPLE_FMT_DBL || - codecContext_->sample_fmt == AV_SAMPLE_FMT_DBLP ) +// if ( codecContext_->sample_fmt == AV_SAMPLE_FMT_S32 || +// codecContext_->sample_fmt == AV_SAMPLE_FMT_S32P || +// codecContext_->sample_fmt == AV_SAMPLE_FMT_FLT || +// codecContext_->sample_fmt == AV_SAMPLE_FMT_FLTP || +// codecContext_->sample_fmt == AV_SAMPLE_FMT_DBL || +// codecContext_->sample_fmt == AV_SAMPLE_FMT_DBLP ) { swr_ = swr_alloc_set_opts( NULL, - codecContext_->channel_layout, + av_get_default_channel_layout(2), AV_SAMPLE_FMT_S16, codecContext_->sample_rate, codecContext_->channel_layout, @@ -317,75 +313,25 @@ void DecoderContext::closeCodec() bool DecoderContext::openOutputDevice( QString & errorString ) { - // Prepare for audio output - int aoDriverId = ao_default_driver_id(); - ao_info * aoDrvInfo = ao_driver_info( aoDriverId ); - - if ( aoDriverId < 0 || !aoDrvInfo ) - { - errorString = QObject::tr( "Cannot find usable audio output device." ); - return false; - } - - ao_sample_format aoSampleFormat; - memset (&aoSampleFormat, 0, sizeof(aoSampleFormat) ); - aoSampleFormat.channels = codecContext_->channels; - aoSampleFormat.rate = codecContext_->sample_rate; - aoSampleFormat.byte_format = AO_FMT_NATIVE; - aoSampleFormat.matrix = 0; - aoSampleFormat.bits = qMin( 16, av_get_bytes_per_sample( codecContext_->sample_fmt ) << 3 ); - - if ( aoSampleFormat.bits == 0 ) - { - errorString = QObject::tr( "Unsupported sample format." ); - return false; - } - - gdDebug( "ao_open_live(): %s: channels: %d, rate: %d, bits: %d\n", - aoDrvInfo->name, aoSampleFormat.channels, aoSampleFormat.rate, aoSampleFormat.bits ); - - aoDevice_ = ao_open_live( aoDriverId, &aoSampleFormat, NULL ); - if ( !aoDevice_ ) - { - errorString = QObject::tr( "ao_open_live() failed: " ); - - switch ( errno ) - { - case AO_ENODRIVER: - errorString += QObject::tr( "No driver." ); - break; - case AO_ENOTLIVE: - errorString += QObject::tr( "This driver is not a live output device." ); - break; - case AO_EBADOPTION: - errorString += QObject::tr( "A valid option key has an invalid value." ); - break; - case AO_EOPENDEVICE: - errorString += QObject::tr( "Cannot open the device: %1, channels: %2, rate: %3, bits: %4." ) - .arg( aoDrvInfo->short_name ) - .arg( aoSampleFormat.channels ) - .arg( aoSampleFormat.rate ) - .arg( aoSampleFormat.bits ); - break; - default: - errorString += QObject::tr( "Unknown error." ); - break; - } - + // only check device when qt version is greater than 6.2 + #if (QT_VERSION >= QT_VERSION_CHECK(6,2,0)) + QAudioDevice m_outputDevice = QMediaDevices::defaultAudioOutput(); + if(m_outputDevice.isNull()){ + errorString += QObject::tr( "Can not found default audio output device" ); return false; } + #endif + audioOutput->setAudioFormat( codecContext_->sample_rate, codecContext_->channels ); return true; } void DecoderContext::closeOutputDevice() { - // ao_close() is synchronous, it will wait until all audio streams flushed - if ( aoDevice_ ) - { - ao_close( aoDevice_ ); - aoDevice_ = NULL; - } +// if(audioOutput){ +// delete audioOutput; +// audioOutput = 0; +// } } bool DecoderContext::play( QString & errorString ) @@ -440,79 +386,17 @@ bool DecoderContext::play( QString & errorString ) return true; } -bool DecoderContext::normalizeAudio( AVFrame * frame, vector & samples ) +bool DecoderContext::normalizeAudio( AVFrame * frame, vector & samples ) { int lineSize = 0; - int dataSize = av_samples_get_buffer_size( &lineSize, codecContext_->channels, - frame->nb_samples, codecContext_->sample_fmt, 1 ); +// int dataSize = av_samples_get_buffer_size( &lineSize, codecContext_->channels, +// frame->nb_samples, codecContext_->sample_fmt, 1 ); + int dataSize = frame->nb_samples * 2 * 2; + samples.resize( dataSize ); + uint8_t *data[2] = { 0 }; + data[0] = &samples.front(); //输出格式为AV_SAMPLE_FMT_S16(packet类型),所以转换后的LR两通道都存在data[0]中 - // Portions from: https://code.google.com/p/lavfilters/source/browse/decoder/LAVAudio/LAVAudio.cpp - // But this one use 8, 16, 32 bits integer, respectively. - switch ( codecContext_->sample_fmt ) - { - case AV_SAMPLE_FMT_U8: - case AV_SAMPLE_FMT_S16: - { - samples.resize( dataSize ); - memcpy( &samples.front(), frame->data[0], lineSize ); - } - break; - // Planar - case AV_SAMPLE_FMT_U8P: - { - samples.resize( dataSize ); - - uint8_t * out = ( uint8_t * )&samples.front(); - for ( int i = 0; i < frame->nb_samples; i++ ) - { - for ( int ch = 0; ch < codecContext_->channels; ch++ ) - { - *out++ = ( ( uint8_t * )frame->extended_data[ch] )[i]; - } - } - } - break; - case AV_SAMPLE_FMT_S16P: - { - samples.resize( dataSize ); - - int16_t * out = ( int16_t * )&samples.front(); - for ( int i = 0; i < frame->nb_samples; i++ ) - { - for ( int ch = 0; ch < codecContext_->channels; ch++ ) - { - *out++ = ( ( int16_t * )frame->extended_data[ch] )[i]; - } - } - } - break; - case AV_SAMPLE_FMT_S32: - /* Pass through */ - case AV_SAMPLE_FMT_S32P: - /* Pass through */ - case AV_SAMPLE_FMT_FLT: - /* Pass through */ - case AV_SAMPLE_FMT_FLTP: - /* Pass through */ - { - samples.resize( dataSize / 2 ); - - uint8_t *out = ( uint8_t * )&samples.front(); - swr_convert( swr_, &out, frame->nb_samples, (const uint8_t**)frame->extended_data, frame->nb_samples ); - } - break; - case AV_SAMPLE_FMT_DBL: - case AV_SAMPLE_FMT_DBLP: - { - samples.resize( dataSize / 4 ); - - uint8_t *out = ( uint8_t * )&samples.front(); - swr_convert( swr_, &out, frame->nb_samples, (const uint8_t**)frame->extended_data, frame->nb_samples ); - } - break; - default: - return false; - } + swr_convert( swr_, data, frame->nb_samples, (const uint8_t**)frame->data, frame->nb_samples ); return true; } @@ -522,9 +406,12 @@ void DecoderContext::playFrame( AVFrame * frame ) if ( !frame ) return; - vector samples; + vector samples; if ( normalizeAudio( frame, samples ) ) - ao_play( aoDevice_, &samples.front(), samples.size() ); + { +// ao_play( aoDevice_, &samples.front(), samples.size() ); + audioOutput->play(&samples.front(), samples.size()); + } } DecoderThread::DecoderThread( QByteArray const & audioData, QObject * parent ) : diff --git a/goldendict.pro b/goldendict.pro index 0ab34719..9d26c836 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -263,6 +263,7 @@ HEADERS += folding.hh \ ankiconnector.h \ article_inspect.h \ articlewebpage.h \ + audiooutput.h \ base/globalregex.hh \ globalbroadcaster.h \ headwordsmodel.h \ @@ -407,6 +408,7 @@ SOURCES += folding.cc \ ankiconnector.cpp \ article_inspect.cpp \ articlewebpage.cpp \ + audiooutput.cpp \ base/globalregex.cc \ globalbroadcaster.cpp \ headwordsmodel.cpp \ From 16bc832a207920cbe29c08b94760852b43adea46 Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Tue, 8 Nov 2022 20:16:41 +0800 Subject: [PATCH 02/13] remove mac and windows dependency of libao --- .github/workflows/macos-homebrew.yml | 2 - goldendict.pro | 9 +- maclibs/include/ao/ao.h | 139 ------------------ maclibs/include/ao/ao_private.h | 211 --------------------------- maclibs/include/ao/os_types.h | 39 ----- maclibs/lib/libao.dylib | Bin 205784 -> 0 bytes winlibs/include/ao/ao.h | 139 ------------------ winlibs/include/ao/os_types.h | 39 ----- winlibs/include/ao/plugin.h | 51 ------- winlibs/lib/msvc/ao-4.dll | Bin 43008 -> 0 bytes winlibs/lib/msvc/ao.lib | Bin 7820 -> 0 bytes 11 files changed, 3 insertions(+), 626 deletions(-) delete mode 100644 maclibs/include/ao/ao.h delete mode 100644 maclibs/include/ao/ao_private.h delete mode 100644 maclibs/include/ao/os_types.h delete mode 100755 maclibs/lib/libao.dylib delete mode 100644 winlibs/include/ao/ao.h delete mode 100644 winlibs/include/ao/os_types.h delete mode 100644 winlibs/include/ao/plugin.h delete mode 100644 winlibs/lib/msvc/ao-4.dll delete mode 100644 winlibs/lib/msvc/ao.lib diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml index 5e8ab5fc..4a6b74ba 100644 --- a/.github/workflows/macos-homebrew.yml +++ b/.github/workflows/macos-homebrew.yml @@ -85,8 +85,6 @@ jobs: run: | qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=no_extra_tiff_handler #CONFIG+=no_epwing_support # CONFIG+=no_ffmpeg_player #CONFIG+=no_qtmultimedia_player make -j8 - # libao was specificly build https://github.com/goldendict/goldendict/pull/377 - cp -fR maclibs/lib/libao* GoldenDict.app/Contents/Frameworks/ # # 打包 # - name: package diff --git a/goldendict.pro b/goldendict.pro index 9d26c836..2a64e09f 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -115,8 +115,7 @@ win32 { -lvorbis \ -logg !CONFIG( no_ffmpeg_player ) { - LIBS += -lao \ - -lswresample \ + LIBS += -lswresample \ -lavutil \ -lavformat \ -lavcodec @@ -151,8 +150,7 @@ unix:!mac { ogg \ hunspell !CONFIG( no_ffmpeg_player ) { - PKGCONFIG += ao \ - libavutil \ + PKGCONFIG += libavutil \ libavformat \ libavcodec \ libswresample \ @@ -205,8 +203,7 @@ mac { -llzo2 !CONFIG( no_ffmpeg_player ) { - LIBS += -lao \ - -lswresample \ + LIBS += -lswresample \ -lavutil \ -lavformat \ -lavcodec diff --git a/maclibs/include/ao/ao.h b/maclibs/include/ao/ao.h deleted file mode 100644 index e0c347de..00000000 --- a/maclibs/include/ao/ao.h +++ /dev/null @@ -1,139 +0,0 @@ -/* - * - * ao.h - * - * Original Copyright (C) Aaron Holtzman - May 1999 - * Modifications Copyright (C) Stan Seibert - July 2000, July 2001 - * More Modifications Copyright (C) Jack Moffitt - October 2000 - * - * This file is part of libao, a cross-platform audio outputlibrary. See - * README for a history of this source code. - * - * libao is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * libao is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ -#ifndef __AO_H__ -#define __AO_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -#include -#include -#include -#include "os_types.h" - -/* --- Constants ---*/ - -#define AO_TYPE_LIVE 1 -#define AO_TYPE_FILE 2 - - -#define AO_ENODRIVER 1 -#define AO_ENOTFILE 2 -#define AO_ENOTLIVE 3 -#define AO_EBADOPTION 4 -#define AO_EOPENDEVICE 5 -#define AO_EOPENFILE 6 -#define AO_EFILEEXISTS 7 -#define AO_EBADFORMAT 8 - -#define AO_EFAIL 100 - - -#define AO_FMT_LITTLE 1 -#define AO_FMT_BIG 2 -#define AO_FMT_NATIVE 4 - -/* --- Structures --- */ - -typedef struct ao_info { - int type; /* live output or file output? */ - char *name; /* full name of driver */ - char *short_name; /* short name of driver */ - char *author; /* driver author */ - char *comment; /* driver comment */ - int preferred_byte_format; - int priority; - char **options; - int option_count; -} ao_info; - -typedef struct ao_functions ao_functions; -typedef struct ao_device ao_device; - -typedef struct ao_sample_format { - int bits; /* bits per sample */ - int rate; /* samples per second (in a single channel) */ - int channels; /* number of audio channels */ - int byte_format; /* Byte ordering in sample, see constants below */ - char *matrix; /* input channel location/ordering */ -} ao_sample_format; - -typedef struct ao_option { - char *key; - char *value; - struct ao_option *next; -} ao_option; - -#if defined(AO_BUILDING_LIBAO) -#include "ao_private.h" -#endif - -/* --- Functions --- */ - -/* library setup/teardown */ -void ao_initialize(void); -void ao_shutdown(void); - -/* device setup/playback/teardown */ -int ao_append_global_option(const char *key, - const char *value); -int ao_append_option(ao_option **options, - const char *key, - const char *value); -void ao_free_options(ao_option *options); -ao_device* ao_open_live(int driver_id, - ao_sample_format *format, - ao_option *option); -ao_device* ao_open_file(int driver_id, - const char *filename, - int overwrite, - ao_sample_format *format, - ao_option *option); - -int ao_play(ao_device *device, - char *output_samples, - uint_32 num_bytes); -int ao_close(ao_device *device); - -/* driver information */ -int ao_driver_id(const char *short_name); -int ao_default_driver_id(void); -ao_info *ao_driver_info(int driver_id); -ao_info **ao_driver_info_list(int *driver_count); -const char *ao_file_extension(int driver_id); - -/* miscellaneous */ -int ao_is_big_endian(void); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __AO_H__ */ diff --git a/maclibs/include/ao/ao_private.h b/maclibs/include/ao/ao_private.h deleted file mode 100644 index 44fa03e1..00000000 --- a/maclibs/include/ao/ao_private.h +++ /dev/null @@ -1,211 +0,0 @@ -/* - * - * ao_private.c - * - * Copyright (C) Stan Seibert - July 2001 - * - * This file is part of libao, a cross-platform audio output library. See - * README for a history of this source code. - * - * libao is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * libao is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef __AO_PRIVATE_H__ -#define __AO_PRIVATE_H__ - -/* --- Operating System Compatibility --- */ - -/* - OpenBSD systems with a.out binaries require dlsym()ed symbols to be - prepended with an underscore, so we need the following nasty #ifdef - hack. -*/ -#if defined(__OpenBSD__) && !defined(__ELF__) -#define dlsym(h,s) dlsym(h, "_" s) -#endif - -/* RTLD_NOW is the preferred symbol resolution behavior, but - * some platforms do not support it. The autoconf script will have - * already defined DLOPEN_FLAG if the default is unacceptable on the - * current platform. - * - * ALSA requires RTLD_GLOBAL. - */ -#if !defined(DLOPEN_FLAG) -#define DLOPEN_FLAG (RTLD_NOW | RTLD_GLOBAL) -#endif - -/* --- Constants --- */ - -#ifndef AO_SYSTEM_CONFIG -#define AO_SYSTEM_CONFIG "/etc/libao.conf" -#endif -#ifndef AO_USER_CONFIG -#define AO_USER_CONFIG "/.libao" -#endif - -/* --- Structures --- */ - -typedef struct ao_config { - char *default_driver; -} ao_config; - -typedef enum { - AO_OUTPUT_MATRIX_UNDEFINED=0, /* matrix unset */ - AO_OUTPUT_MATRIX_FIXED=1, /* fixed, immutable channel order, eg, ALSA */ - AO_OUTPUT_MATRIX_COLLAPSIBLE=2, /* fixed order but only used channels sent, eg MACOS */ - AO_OUTPUT_MATRIX_PERMUTABLE=3, /* channel map is fully permutable. eg Pulse */ -} ao_outorder; - -struct ao_device { - int type; /* live output or file output? */ - int driver_id; - ao_functions *funcs; - FILE *file; /* File for output if this is a file driver */ - - /* input not necessarily == output. Right now, byte order, channel - count, and channel mappings may be altered. */ - - int client_byte_format; - int machine_byte_format; - int driver_byte_format; - char *swap_buffer; - int swap_buffer_size; /* Bytes allocated to swap_buffer */ - - int input_channels; - int output_channels; - int bytewidth; - int rate; - - ao_outorder output_matrix_order; - char *output_matrix; /* physical output channel - ordering/numbering matrix set by - driver if there's a channel - name->number mapping useful to the - backend driver in some way. Eg, - Pulse has fully permutable input - channel masks, but specific channels - locations (eg, 'Center') still have - assigned numbers even if not a - specific slot int he input - interleave. */ - int output_mask; - int *input_map; /* input permutation mapping from each - input channel to a location in the - output_matrix. Made by ao_open, - intended for convenience use by - driver in device open. */ - - char *inter_matrix; /* channel matrix as presented to the - backend API */ - int *inter_permute; /* maps from each channel in the - inter_matrix back to an input channel - (if any) */ - - void *internal; /* Pointer to driver-specific data */ - - int verbose; -}; - -struct ao_functions { - int (*test)(void); - ao_info* (*driver_info)(void); - int (*device_init)(ao_device *device); - int (*set_option)(ao_device *device, const char *key, - const char *value); - int (*open)(ao_device *device, ao_sample_format *format); - int (*play)(ao_device *device, const char *output_samples, - uint_32 num_bytes); - int (*close)(ao_device *device); - void (*device_clear)(ao_device *device); - const char* (*file_extension)(void); -}; - -/* --- Functions --- */ - -void ao_read_config_files (ao_config *config); - -#define adebug(format, args...) {\ - if(!device || device->verbose==2){ \ - if(strcmp(format,"\n")){ \ - if(device && device->funcs->driver_info()->short_name){ \ - fprintf(stderr,"ao_%s debug: " format,device->funcs->driver_info()->short_name,## args); \ - }else{ \ - fprintf(stderr,"debug: " format,## args); \ - } \ - }else{ \ - fprintf(stderr,"\n"); \ - } \ - } \ - } - -#define averbose(format, args...) {\ - if(!device || device->verbose>0){ \ - if(strcmp(format,"\n")){ \ - if(device && device->funcs->driver_info()->short_name){ \ - fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,## args); \ - }else{ \ - fprintf(stderr,"info: " format,## args); \ - } \ - }else{ \ - fprintf(stderr,"\n"); \ - } \ - } \ - } - -#define ainfo(format, args...) {\ - if(!device || device->verbose>=0){ \ - if(strcmp(format,"\n")){ \ - if(device && device->funcs->driver_info()->short_name){ \ - fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,## args); \ - }else{ \ - fprintf(stderr,"info: " format,## args); \ - } \ - }else{ \ - fprintf(stderr,"\n"); \ - } \ - } \ - } - -#define awarn(format, args...) {\ - if(!device || device->verbose>=0){ \ - if(strcmp(format,"\n")){ \ - if(device && device->funcs->driver_info()->short_name){ \ - fprintf(stderr,"ao_%s WARNING: " format,device->funcs->driver_info()->short_name,## args); \ - }else{ \ - fprintf(stderr,"WARNING: " format,## args); \ - } \ - }else{ \ - fprintf(stderr,"\n"); \ - } \ - } \ - } - -#define aerror(format, args...) { \ - if(!device || device->verbose>=0){ \ - if(strcmp(format,"\n")){ \ - if(device && device->funcs->driver_info()->short_name){ \ - fprintf(stderr,"ao_%s ERROR: " format,device->funcs->driver_info()->short_name,## args); \ - }else{ \ - fprintf(stderr,"ERROR: " format,## args); \ - } \ - }else{ \ - fprintf(stderr,"\n"); \ - } \ - } \ - } - -#endif /* __AO_PRIVATE_H__ */ diff --git a/maclibs/include/ao/os_types.h b/maclibs/include/ao/os_types.h deleted file mode 100644 index 8a565535..00000000 --- a/maclibs/include/ao/os_types.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * - * os_types.h - * - * Original Copyright (C) Aaron Holtzman - May 1999 - * Modifications Copyright (C) Stan Seibert - July 2000 - * - * This file is part of libao, a cross-platform audio output library. See - * README for a history of this source code. - * - * libao is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * libao is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -/* Set type sizes for this platform (Requires Autoconf) */ - -#ifndef __OS_TYPES_H__ -#define __OS_TYPES_H__ - -typedef unsigned char uint_8; -typedef unsigned short uint_16; -typedef unsigned int uint_32; -typedef signed char sint_8; -typedef signed short sint_16; -typedef signed int sint_32; - -#endif /* __OS_TYPES_H__ */ diff --git a/maclibs/lib/libao.dylib b/maclibs/lib/libao.dylib deleted file mode 100755 index 81e437b0292a5022e8c11bc7f98be30a93263379..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205784 zcmeFa3wTu3)i=H;$w*KzQL*B!j0hGKxe1CQ?F1MdEYS$!t<_{mCNL$L#AG7Dnl?DZ zGK^z`wH903#!D@DO)V<=77S_)TKm4yTAQ}C9j&crT3XY-wuV;a`>nP1K67RggsR{3 zeE;Wv=E*txti9J>d#$zCUi*4ZUU>h>9ZIPJk5VHL7Aoae%2Txo&xa#!6hgo~xT^c{ zbU1YQWWis{vO7t_EBUxEgRZ;A+6tfU5yl1Fi;K4Y(R` zHQ;K%)qtx3R|BpFTn)Gya5dm+z}0}O0apXA23!re8gMn>YQWWis{vO7t_EBUxEgRZ z;A+6tfU5yl1Fi;K4Y(R`HQ;K%)qtx3R|BpFTn)Gy_;@w&KmYp6`*`u+gBSnRA-Imh z)rE%+Rmue&i+evl1W;LdN#OEJI4bwnlM5;hdl79e!lw<*FL4P8 zF4DLh6sdM6SXtQ|YgyiGN9EId=w3;>6ui@qVExE&v8D%6`Bzz4-5hI*L|52wuDnH? zC86RN2@R~#Re^cXA?P(ko3jGv^H=qhAR3htoFnfLdM(k_k!Ve2BwE{mw0wG7HNBwD zM{qt*PLfow^pS_k%7tZ@lvOUc=)$GKN{`0!>o5-{JE4noNfuIBxuPK}<^JheM)^IG zA6fZF`afGgQ$T!KxP&i?F+WYfKRj&sGBQ_I)`VgqgS&rv17xK9^Bh3`%bT;-Hk96g zSNIz+y^!Jj9mhBx^nC#5=RjRs6~#+rB!Y4i}~ z54VP^TVkQ*b>Yg!P;BM2sZ*z&*A%J`uWo2s)jX{(vOLrG zc!q|17J5`WluCM~GScUJ)Z+*zE%T_x!<53Gs=!6REA{0=cpa{Jxc2v}Sn5&N4wHC1 z;;5X7Q$}AqtKlqUU(}G&@s1M+u2rLaZT^p$mH}Ag)gTbYU9CIAy6xNJGi$FOo z%}rz_bcxEQ&Ue}i={JYJ#`)+*ZaWZv=QXrM(J-OX{d1VbK^dpuqI&hi?m7`p)^HzS zXMH2u{ka-&HQ;K%)qtx3R|BpFTn)Gya5dm+z}0}O0apXA23!re8gMn>YQWWis{vO7 zt_EBUxEgRZ@c(fQEDI+75RC6B4W_&&{T^H43GX*4NP53UL2C2~zoE!raWFM6ff(yY z*enkw=XKC?1!ND#=e6Tmm2~iqe5!5GIu<*{pz{SHkOaJ?5D%$&R}!3>{W%2IdDvtJ z%4HN4f420hXKG8vtz%8v{3O~2gYmXORkCg?6_X4M29tA;|2E)RwYbHR)cnRivAx5^4}}@X^T5EEhqnM%KuJW7pKuz z3;I6%GQd`RlQR9K!9-v%Q--7&JzBP@M!1r3O3POjB>9rw(?JOt2A-m#chF|F_4*AQ zl}5A$4WyxgIR(V!==85C2q2}HgI<3zm9C$8Hy0TOkU{ti3_!?&l8)~Xk|b0K{y;G4 zFWy&C9E`V?0{sGx_4a>@h!H=#K-0!avP^wkOj1#dDClsDiSTNS04g7UWR9f!(BlV0HO!7~7+O-~&f!*;QPa?28^Mm)b zZ9)=iM0Cz1m@J1b(2!UcFs^5-(DEGCxloCHuH8dtLxM@~j@ykS$kYZ&AWfoU4vZU# z*ZdBNiH_+6rRG(E73&r-f~X)x#kW%miavsiW<0USuTq4ad{s8tXiBUS+z=1*4G$e- zxm+nw+i!BaM6x#awj)Do^s5M<#}~c~rHm6A?{6Yff2O2(&xsJZn0QOP7EGij;mLaQON90)$Hsd~ zg7Ne~aPqUk#GApy_EJWD)JH**==K~vsW;ZEqEYtw`kyWep+d--d zCZ5e~gs}#bqV7x^(e*9_=hTLh<%7Yqca?Da4kq?o^^A2N5K0a+E>-(eKbvQw#UhRN zf;GxbO^>QB4fnz^;!Tgkv)xdDl@|XHNN0Xc{8YE?-a&rVx`H?%Ul?zLE9&5rV!eSu zqLjIq&A=`o3BQGc6UDkDkO$}1T=Xz>unLVFg@6+Ix5SuT!&LuCy{s>%=QftnTys2(6-Aul}aEy z^qL6K=RfOrIwgBNkn|o)-5;UF=Z(fAs)U_B2!O)8!w_Zd{vw`xz5j;ur=RwH(!Ei} z)?!G(0~H=mv=&?KltTs=)_3e@GFPfxj9wBF39X}BzaMI|wxCK;$c=U(G=SN!Jtmf= z9UYjLs3ijZ;H)14&?&Iqz`Mk2hW?EhHC5}Yj6Ur4!dW^DPqQ+jNrf-ITrvIVwXm)vu5-pc3LB;y!f*|s#Mb- zRzbc*+uO)u1yQ5H1eDPm=m93NU{T9Vly?P_(0QVKv*xrLDBXmTYnRtbuFF9!(5NdI z6@y2WxeBOkC*TFrqM&8qy1d_-%g#N}!$u)|P3LSilydE}Mk1=@ zCP-isD(Eo@J>-mx&*50_j!sGhN!^`g(URL`G{ggtE71JVS66`L%vi~}j&st;BPNMw zP$JUg7H`|^De0I^xXkK0=`Py3k)Z_{tm{d9vKVQUZQa%&j{O?L(k-8AuQdqiN{ehl zUV4N)N&mt`$1LbFZoz_1Hw7nk986_Alqja5;|fdG9Rs7uoB$(Bwrz&Fbc<#xf-o7B zwexbT2!n}4;ErV59oFRO^tdVBwn>$w?i5izysDRCbSSFk(Sf5zlG`PQRej}ktm;3s zfKRRJV>u_OdaWexqD1hctgG?VtEf-STv7s|$~VP#dPt^3a89!P4tc5&AzOpiXi_mx zGkVZ%R%NzA8~anlzo(G&wj{B84>ut-qp{or<_0 zrm{ap{2gsB5x6PYc9XRN*%E>E@wW9Jha$>SMiDaBcQ!u9=s$?Y3`P75Zy6XxjNqK4 zhz3b~j1pN9i}9otF&}+vvV6U*h?}$`;Lx<)LlZI7ty2>pxq4UKWTfKxK#rYD3|H^l zX#bGvy{4>GGdL$nb(BbzrbL$NT0HeC_S|(CTVxJJY?AsTZRz@HRa0%?b4@C*uYdwgw>qG!TF73S?*Mk*CCI+ip z=j?#bRn|$Mkt&_U;LDA69qmH>4Am1>Y_vx^Uvr(BeU`BIPvm9xl3X^)KDTU6 zN$L@J>fVmlEIaK`-AZvA?d{azE=J20!IGR%vZHuLPkgUh-!TGcCF?#xGMgmyI8#c# z-Xm!n7=yYguJvQGh?u#0bUB&tfr`+tP7xo$lsEJ|Nyp1LpQTK8LXZ-Y=k7ws(jH8H z-S8Ql{IvC52*}+Xmo*02k}MXjYVbqm4iJ~PL`RICw{vmmqpWUnJ2dO)fd#Kbc~n1% zG3)bU;^(g4SJH7NXiM)qg(Yg~=3%c3cjao|61DH?X-R zRSi4p?fAT%Ku@*@(6hN7ZTXazELuO8bL*CSEXXn6NhZQ96JF*Agv@bf9I~Ln2K-Ur9ehH$Xf!lyQ)L#FC8N~JLj0Vy} zG$1kD4J{I;4=1K|CorFLQg`1hiGTZoQ=;Lxx>;u(VP|~@eia&g%w*+u6>mkSwC+13 z8k$+sk7iE&$*htN^gA#$T4BTkv_wzFHd1+}Mrmwn^q^;U4pXC8RxmwiQ=>;iPWFws znYXUAjt7IxTd$v*zf>A?*Xpwd&{Skpo(TFVGTwTwr{w0lF*+9k#tKni$-1vn+;IK{ zBPNqjL61ZHi=OelcmpMp#r6-WFNxv$qP`w_y*iSuuUj}L)z>6RETcpcW>|*q$|i(| zW#}S~_0F{!+Lg}`FRu0>*80+s#PxQ;_&P;FU#Z#KrS`W$r5WfDDBeA5jeI?nF(4V~ z89iuf_9K$xM#_NutBo+6MYgl_$4LjPzg0;8+xWxfFdE z6+KP}e1-{dFO;kxoaKV^=8BJlz1P}}D!PZTCozUSABrxKqU)$=&0ZH1(CiV;v4Rsc z?1>6(gB`ptZQgv}TsX+FWX0BS~@|Zaj=U3Y@{(5BV|$Xw6tWtwvP5?F|ga z1DuGxoYd@dDc3FFg;2o#F35V4B=54Kh_{Z%tyhhpIHMda%Nqy9MD`M1c@7aC$y>jx zp}dDU^OgaSrMP~qSb_QST~_Cxp}7R=haFdk3^TDt{#RtT3oRxpREfC@=6UOz6=pw# z6vTU(Icv=?LbV_=0Lz*LNpA<347>p*21*_-gI$yl%y{{oYi1<^ufRqIk}a=T_W*@7 zy6*Fw6$m}?HRpQP2YO3x*7iIg_B=4R%tw=lK<|b??*vcDV?Bw$i@kw9@Qp%9Qea@t zLaW}I2eNLNSI}}a4c*K8(4{~X8B!W@;Sn;UZcsHCyno8%O}0)-wt!|}AX#xP2f;ZD zlYv*P7}(6*2()-GH%wI;(KwS=5?f5&<`*6tH6Zzq-wB+Bd9g24N*{ zJXciQj$M($z#F8$U(pbQW>q=(r{&_4(G4cc-=G!1>gPcK_GJh>PXr##C!hyBrof>D zY>EX#C~hN)e z)XL&SIcmVJnccuKwFHB-Yv~n!9?Lb>hiA0rxP@h7YJ*xRL}1OB`loC}QOUYLQ$&Iq zA|9aS-CTWI_B1vhqzX2Sflb5XV{>#pKc?~6uVZP0k}C>HXeEV#-8kKVhEy2nN1Mp7 z?5E@xQIFz4Qi`BD8Cpbs>CSQ}Yd#A^Wq208Lh8SpM0HA;aO}jid-{sb(Y#P?GoiwYg>$7PzW^vG5X;pC=cAziA1N^G& zJL~=L={z1wdY3&ZU2bn+4|t_9JN3Nf!Z&(d?&i}Ns>(4tboz~@Rx1edX!bDRp+`rD zpE*gg0F^hz;mG&!*kVs+Gin1JGw%CjSTNl=h-QA0^R_>Mp=v2;IMYhT`OW!6KkvUM zz25^K4-t~y8{||?NSJ;IbAfOM)}2QTXK}2z1=}t%5U2XJaguES zc|tu8!)HvWM_&nJ(W@9`oQEdVS4!f*724T~fvr25X+!g0g)zdGNLQ(?@IJkPw@D4X zfdOC`W#1+q$|xDb6V3SHOeUZu!gSk6v_vQ5N+hEK@7)kxPc3pK!cdaujTTM?l!Ez} zFp7s{XAtu~rs!S4d13E#f`G-}B}j+c5+aGV{yUx%9;|rl6jgHbHi1}%QXZDyix}>l zVRu{&A5NN|W5OrW^yEqdFh`o%!f5#NtTeZCUZ*rO1<6lH;7?`r&<%VWtHl5iBjSNf zC8|z$pwx2wuuJEB59c-Brc)GGk>FfqsN;1r31a1;s`zY=%=bv0+=6Iw%GP0~Y&@WL zPBZzONA?UPkDpPNF`1{R_x#XZ3Nk!b}Gdyg2#dte8x_}sk7sWgp`&}5s zX3ww0_Za=1h;sI)KR+~@qdz!-52e2i-l-2Og^Az1Cn0djtvx&oBzClaNqNJ0{8efH zcp~DNzm)ghOZgFwp>1FX+N`pEwTxqo2f7PWvtY`*0&7pm(&sp3^<6JWk+#|h!4Uck5yD|*n@yn8Ih54w z_Yq~C;UGpU4?+)5OwtRInLr^^`0Y>%e0_>eRt3`$~Kv;$t?h3yr98V&KrZRo+=WR;eIoSYl$GB0l{NrLH z124D7`wDD!;_xvS(eYwhwo1+Zl(5i5Eck@$ zdpWP@Iay9f(*&tJhff?sj)|9r9?>H4I(b!i1Xd%uqq`UR8o zy76dz@m2H?z22^D^hS!lL9o~AXmaN5l+BE99p@>rnxl`r5{7jo<)neFj7xrqIOv&# zf?@E9=Ke%+vK(hHF{KaU90#Qp6C^H=7o_O9)cWpT+Maj>b zz&XHC)(c1JT_Qw|Wiq|~NkFDj`+NP<%_HUyjr!T5bDK;BRf%%-=97M=zJW7CsX1e5 zyFZKXk?}p94i$^5Cb!HMN8{ER7ywz1T%unefh74F!O^mT zr+g^e`V>*)o&ZyXU@)6m&i4;_R|VGJL_AA^9+0DeVFu)Hte^s^g3?S@-?(m{~=hdZo+4BTx8zB*!nIB3OSn^KD0f0~}@oMfVz1vxqYj7-*pCa0qmnxbTm6kOH@Dhh^6 zE4=04aE1gI7wfaPzo$}$=oVGJBbz{m?bMq%?JGIf`!~#@q{{o8IA#u(^!D6O2T9A%lp;`9xS=>6H@ZFk{zx4tR8p?!{37&0uSa>+y;s? zbJ&)7jLengtuEh6L#?|>Rea3rN17rE>I+WBJ{kmGcRNK2>P3Vq2ftu?^x_-D#Hp_> zy6}$rEbhq~*SZmj#5pnm`6YfEC;&X!*g1xaY{QPh?AK{r)=O`;?6Z=KC=;Tk;8*V= za2DQhk>olgXAVc!WMC`L#a`k~z?!BpIk``!g2Pml^*a+aG$|VWywx0%^2jzcc7) zZ}NHv-lw4c-@I`}J{U%gm#PMXJKrp{Dv2w44KYE+u6J5hcG4TewzJ&uI&&C@NC$vJIh| zxk5weg4J-xa%vu;)s7U90%o=qu&)#=et;!?AhVjR*c2d*@-um)U@(4+5UugLtaa3h zCCeY!2BoT>r4N%GmSqos3~N&kPx*fSg!kmHmt? zJt1^TE+Oy&x;m##E7Qj$2A$Sy#>;E>_}L1*JFX_JlNk;sw!cBrB_5^IKfN8V;10St zB}J!f=qZ@mK7dDzvgxf9Yb|^fj^Yru^%c}qFww!sa^ieC2L{a}fL=ZjN7*yG=tfUC z0>_xuDJn#pQxXZu4q_q6(NA)1y`FgKq+P5njBs#Tjd>|qHz@}@FFdro0AHG&IDqP^Qz*X zpxfI)Z<;|bAS0FX_d;fu8H{hIV30q}`GIY(wB@w&Cf1AJcN~$od@} zS#|j~UawFE1zyR-$#SIdiP^#r13?^4qD`+ev1}sn{9nvVp3|h1k4y3dCeB2()BXW-QHT0>}YG^S3_=dpa`ASV|rKZhb zJ`M6T*>cPe9#+rjzP4S}usoDZwn9u(u4CjHRXEFx{q{%}L!hxydZpm#shBxv>#TeC7vx_w?& zvyW^DJd#f_cbXK$SO~nOgOeSz%>s}J@@pyE3Y4}X3mG&-gR%y!;|WQxUA80A zlwS(}2xnMS(m{he>$X4OP&pbP@3x_pqnB2hBXPqs%ueZJgBU#O0Vv+k@8ln^SFYXT zBd?zH{+6~SWPFG5g!OOupVYif7#Lgk%|%M0BTZ3BoiaO4Dc=Nryc$6%V4#YiBtzD2 z$}?{-#uX)B!90gMD9-;VAwNmScAxOzX8rFu*+i^Pf$EbS|8t5rr9C=;Oco7_!RTzw zs2M-8!qz@ZVqoC(4dkOwVl349TDzx5vb~Q9hb>=QJ4UaqobjaBO{xN=-=;3nMVLl@!@Q*E7iS&OiC)F8#WnzC^v97io3$yOyj$h$1rmq*?KGCE#* ztAm>(l=enm)X635Ug9Wz^I``Yh_c#*D}KErzMTSOJV7!N^c+)_Wa`2AO&3VUZ;zyA z4`BFheFijGBHeb{$qu)jjhr^cqp}o1gI-MFQ;xxu_Y`4(qkse%w$rmUK>2ww7Wym} zY+Y=UUs|z>p8^%ilIfL!1S!p$gnZB{nP)O^lRhV%^nMQOpw4ka38l*+>b1}I06_gd zJ}0++Wxbi3Y_^X=V>}w@)WoQddJB0-_91Oj_mpU{-0|ynh+O3Q*R^O8XrXDe$U$p_ zEp8e|F%dn0o`+n(-15Qof#2Ewae#ZCHI7n$w;}L5+Y|7Vg!)0 zwc@}@V&lqQ&8PL?TQLW~!dEFKBj(+Tg`9N`NW)}Gf%9#_*)tnBpl<5{6=lyC&G$pH z!XqJOq#79R^JeNL*u_1r4T{xe}=KYzjQj%@tG#l*T7RSe(aP`A;a6>Vpd0+ zg*5^~HC^_LvxqH+EvDw3jqTYfr6XpKRVV|a!bI#|j-P6vT zcz=uSh;0ARh0mL8LMdI^pgZBN&^*6PQFuG7maV6=HWB;;Vm2jJyl2GD!NQ&C!feWT zNy$c>!V$c!*Gc>m$F zN*>-NCDL9ZMMBPUgp0=GO?jMu&PwGY1kjuC2{6D^OzkoR>wTf zv`KTIj}78tDFb6HWi?P4RCK&|lujNc$!x_HHVcM)kB~3TvOtyz9uZ@3=;dpPF)Tbo zF;L|g&C;_5-Z^L_`LT}rghqMJz*&@Dio&j##^7oKm}LduuVREOD=*kFCf83S<^)ZI z*1$m7#g`V5?9_9Y!PUZddiTbus(j+&rR@R|*y zOvs}ATt}UvQC>B07UdTdg*QkvM!yEL0{zmCF#`R{jxhrLnqnZ(6isEffwSfO1};2? z0WG}RZ{$R(LditXsW9sQm)Dz{*>V=KL zT82VVPer+^xfiMt* zp=ihWLIx6Kk@*7&S&ux>_#wWh3eD(FOtG?qhaR+!Z4kak4<5Sd84ZwzD|qb2i>1-# zsT7$E&Y_4za14TN@j1nMFNBc%qX=Ig3Zul*oJ35mm3~X^MLc493iJ#;5ve2(GeEeM z==b`ISPA@CjByNg{oP5GwT3mH)9w-O|Bae+I5lF?&c<8?1}ug#26Cfwk5{U zAjeHHng}^a z)tXG%*-653^_&U^Kg3PHm6<=6IugXui@=9hp_e!byyb3J<<6fl zX#b%8Vm`9}U+6FXFp1>C=H-`nHwZ0 ze6GV*$;>3iR4$pB#F)w@Gou*W%u;QX4JDfTqmjNfpBQy^30x}mZy8*2kBP zcgOs7I*$inKm4^xRvwQF;4Ao5^8w7AtSWHA%UfUL(r{!iHTyM6INv0c2t)V)5HXag z&EoYC-ngN7?0&K21MZpL9fbGJDY~F6J-f2ZFozbcx#F_7oX&--&@bz`rhm!SAB}e` zJ{v~MBKCw^;~&)c>+cgkbbA6nx=6DhH+=uzh9VBazHIgv>h;)^_v>g)L+y!_xPzx# zf0+Qv!yDD-xiVl>{we>`kI(tX5Fgfa{-Y6=!}w_pKRA6Di=+C)ns#Oes_{%>pPc|) zQxF>qyjE^6B4pRs@O^~?*xyZ<9$INI&Gz>=^Mw~Ae2BqLUcBvoWSHJq$uoxY(Am`SlK2cI zA`K4Zl^O&|Y;I!AoCr?Itl=!&o=yO=RchqnnLzNQuY; zfuzLG5^Wszv*tS}-2+M}I=Is+K)Ic0i0#ON;d=H9e!YS99F@d`buQ-T@zaqfnDm~= ztMR;=R3g!RdD*IVIF>ZXb+R+;~SSAdz-lC$eL+g`%KZE_{jP zpeXBV$|0)4*YY_k>C>D}0He7xwoSfcP=TVzg^G&lc2Z5hj`My z@Zw`$0*(?X_pl|lIZIqj`QrSQTkOPqnyD~k-F702M!;nmrr zq>L`Kg?9d`jHTCPEF=(X%>JFEVrr?I@Ia1BwvN|63$Mvt_d3Fs@rynmNJ};}M9U7( z()!$MZ(v(XLrbVP@T0oWN(4Q1jg1JNB?@rU6p%-T-`Zxa#B2sOZXEKrkv43v*_utL zphriKC|gG4g3$zy#O?|An)<74+0IoqF!g&KQ&CIkJMTg1rtj>h{e~p;xo8F(tDh6kAHfA^y4J`IZ8*eEx@5H01k1}Ugztak@h)Ti*b}X zy`ygg>gD+|o_%5?;(b`BEnGJte-z=a!>C5;MVhfwIEgXB(f^D<)r@oqH;*&V5#jEX zbb6bbg@Zm>2J2+RnEuU&F4s=QE{OQffRzklxu3r3kZt&9S3Y4D+-B@ zbJ1$}124xyVy2MParmSQwWSP-r~WIxs{mgB=T{Cb@3ZkvB0F0R~kgvC*WW3H^ zTynFGRs<5n5B8UM&K zCvz<>K=H;zS94}vi*qFXWJ)JJnTlI+7@qm_zQq3ighQWwJs7Yq#Bk-~lkQba6GXa6 zL!^@!Bi-F#4mKJ_@kYAaIkT4Tc}WjYx>LHup-TO|q*N*wRUJfCe|~4lq|s-f3#u*o zHSH;p2~d3L(T5}Q?mEr4id7@|yxF?@sq%*N7dK`TE~7_>35g#s<5=$nHnU@gFe@?qO4R@@ zr>18A4O4m4$ImehH(Tej_cDhHNLCPzM_B&>;h+rL;{H+0ZHs1)_>VQ~wov)QaZWv; zPPmjFhj8xaSZ^oR*F?=UUUH%(ZQK2hvwNBvqcG8DN7N`SB0hT=_Uy=OA(Lk5)pCFz?e9b7qX z!Ibw;G+(DVI1RIS1Ko%jXy1WeFe@XnE9-eIl6`ywk^r+wGV&WMIh8LlWy2LXF0PT zP0=DID)61d^O&EjnNRwsQ16Y8w-!BN71Ey0JAadfUjC~0GNcsn(D?Ru-j`EOX*qqE z#u+Bk25BJsnS^xG@592_BPdSRi&62xv8<(d>sT!0d}LQzk1kzQ!*43()T_j>XZpu@ zmU|z~Wwa|jgL9HA9U)42of4fj3J+^)lzAp$o}Tefvm1Uj@KO0Pp?DXEKKyvhUw`c+ z8fJcvfB2Os-@OorF!0IDKJ#`s@vL9b#uQ*Wp0RaF|0d6Tl%X3Q1R5k>y5*(eCW7Mh zFR9E|(z?y;L56;q`@nXzxVkyMv<#^6RdO1rHU!X+L zvn_oiHDtWv!T(C^?kp?0JZkSlJXSC_+46Ii8SaPc6dv1ic?8G~xsQi;uSzA&BWCn4 z=^D;SuDFkfcfS{uD5G-U0;xhH)7IvM!U+`zVy_(j5M zPkZapsDLtoun$Kri3+0KPA(9%9Ja6o9Tftm4?``QP+>`CGa`c?Iw#kIZwBIf zuU)4Bt0#*W0$v7lO-9E04XAWwQx_l=5px6gl*G~IG{r7Zgpj8J6O^(|=y<|j*2OXe zCry5dk2_M87CcG=&h-KVwBQgfpwXz%w` zna0QGt$32%h>Gav4|lJdTgar^iR=s_i#->#a%ippv@)2*F8+Xb$8<6H{`S@}Fp5j1 zPWx%8z&dOs^-`}4?SFBqS+~-GY%3iwEik8*Zh@kt1@wRc8;Ac59=Fo3!r3@bANCl z6p58A-tp2!oED(-Bv>54DsKkPj!@m^uQaFk>?Hi-UddtiRZ<;SOWJK1}9O|OwGHr2K6$U#Q!fWjXQe3yw5q<@1s_5 z`xAXr!?Qr-2qN+{3Z|mO&^A#+1eEdxZX=<6_!tj%hLOy5LCVFJ?d~1XNW%&}|G=(p+Bz8+yihM&oT+*KQ-U=b&UPO=qa3ybnfuNE_ zvj;P3{6L3x7TWRtJ+5eTlxXWk6l}DqI2#-qY4Ze0e}K}d(v3FL4)s~Tf@(iLw%f6d zB5V)uhl#C+(KW*ej&`uUh_h+7pO^H1fUz95CxdN15efA-RzdyrtuPZ&NfDnwL{5vZ zaK16L|MRS{RvzrH!+4o06s@autaTk2z;I*0x`rQyoV7CNnQ^2>-Wa-yb9=9c+R2Y3 zz1QIhZ;@$>#VckoPH3RTGJCOsv_<1DGl}HSZ;An7=x0P>5uKWlV=OpjG|YJ_I&Xxt zM*MDhi=?h)8JjaAkGN$&@m z^GV##<-P^|WhMoEJx>pb-W_}h<7on9w-W6H$0p8)z)(*b&L)kq3ai|__F7(Tv!0fr@ogs*tpmrU#P;T`)F;QM#@-o^L3_qS3!}q88{w&|0vZrs)Bs!6R@HR0tgE7Y~&rsWOIVRcPQBpg$r zhRTV}K2ABux40ox6Rz>qG(~{qL;R%WEs?s|>5=HRYNDenN76Pu?^Y*tg78x#sg>60e= zYD1B_a1E6yq$^|L<{0AZBhAgAmY3iFMfS=_w6j)c)6@>$%Tt9JpUZuqG)4F%vZfK6pe=KeD$GNQ>4`wiC!D3i`2~Z zMOH)`nqY}A^#43Zc`pCUqM_w=VbXGasL>aSt}&%HOM{9qCz=CbHMGRQn$h=%%$-xu z3&mqB4^^)UM{9KJBZgqZx;S4$Q%zV)tZVu|%$28KotwN@L%7)&ZHW1rTN)c1nqt0C zORNFnMyib>NHLAj_S{29E`jvqPa2|iYkZ5REiov~#I9&&>Yx00|X&*l4ZzKWxqwGZV4Ud^ac_=5*hG_T$7?tF_ z8eQ5@A4UstG@E8$s447giBk2U0f%5)t0Q%FT-nQ!&>XIDHlPnnAV-$w)o4V^TWV|3 z1vZ7zOE!gT&ap+=PihVYAIzP-E)tH$ zDwnT`g)3_tnqb@KoOW9V8qI@9Peagks@)b=x@@RH2>gg5X42Y$wV-i@Rlzp6BQQvaaBRkf-Eo zWLdN+T-~rD$^w|)AR2?TA~&pSfZ9L zR!f(t`HR*31#12hwfMY%Dx0CoW~#C?RM{+5Hd~dQsmjh$Wph;7*+`m>3+Xd}FasDf zfHDI(Gk`P$STle&19&rmH}@MZ#UCh%~0rtA#hoiS5uM_1S- z7?zPY787G1TpK|vr%?(yCscWDsHHCE91;FUd2%cXRA?MX1v-o-FE%H~MW3AlFO%ia znQz#%;6>#DH7y*grU7uMVQO_lv{p@<$^fjCg{c&2)rBo^Wx6wt;#nuZYg#_7E?F5tXD3~)>GR-bR!q&+>BPDkA9;#q^uEy;b!$Xi zH=gXk`ao!_L)T(xa;dKtBWc5BS*WQY>I*j1#jdLdtLKJR%A+41ZfZEXqG@Ui2EtRT zL!VYl;rp6RQw0wp-&9a!Y6`vHlm$~@gHz@&o-!ZLi>EADGG+dPDN7emft4;rnI$t>suY!%$vHF?*nwC{z(bF(RhgziMrqF7&r0gM} z^2iER7m3B{@W>rXWh_!3*0p61`{qkuLrFe3dhY3W1xM_{AzM&>k8_9NjD??2+t7$}pE{ePu&!Zgr`q24vxX4ZjP>gB8 zy1_JsVi?xx>NzlC4&4O}E$~b)MvMbdcVZrp zawHlHufQNN$CrFy3H!-$z>-8Yj?v@?mNE?X0ZVAcd=z$e5Ot7;c|gi7(Yzemc!sOr zA-F=_c7fSEWSI_=q)sl}8mf+APB#&=Yw5BluE5}`ITjA(OcFi{ksN8Wt&O+|ai?Gg zco@DwmwE2&;4|cuvjB@)JQkv2hVwG}N64YW-jtltA{tL)8R9xx_!*AiL15-k&N>2K ze}j+k!GX1e^)w1&jv*dne~3cY4CkrmqQRFaR~vQ<*w2pmKL90%M~CvcKg=PS+wB|- zY7U=`v6W4*vP$^1n#$Fo2(2_~l3J1vzz|BdjkE4A;uRY1IARTr*`Aqv{lQ}nN7?T7 zP4Bxf(%gt8zz-_p;PRA*sxMmVyWCf{ELgVK3>YyHZfI^*&B4-UOsuHq z{7O~3QunDj-?~PrZ{AM7EuS$6*o>jym-&tml&_&HAW-!9ILCXX^gcr z&@=X06m9v?&lzGzOZALbicVqC_0YYz;YZKdL{p=Xvy^jFZ1zE^(srUrA<>|a@F~P* zD2LeGd*Bmu?KRuqM_BSaycJE9OL1v#VxP6X58AqsI! zmqR*yO7IvR;tV>&v|U8;ba0bG+R>$uwlOHg<{XE#5lyh@r?eegs0?FcnnP^7bLi9I zNjil3@GEUUS%(vJI8leE=tfa**ZK&hjVpEn{W8F^WD9<8gMn>YQWWis{vO7t_EBUxEgRZ z;A+6tfU5yl1Fi;K4Y(R`HQ;K%)qtx3R|BpFTn)Gya5dm+z}0}O0apXA23!re8gMn> zYQWWis{vO7t_EBUxEgRZ;A+6tfU5yl1Fi;K4Y(R`HQ;K%)qtx3R|BpFTn)Gya5dm+ zz}3M2^BS0bF|kPh$Ku2Nc04Kh20Zj7fl}2~AfYOfu%b}HMlXdvLB@UW59qN}y>h>V z|JLw(I^3s2&m)pvq{9(9JXD9Hby%vyqjdNQ9UiB{6Lsj*;mJBYMTe7hI7NrkbU0Io zvvqj34(I8xOoss-F4AGS4lmZ>G96x_!>e={(qUMK5gpd+@ERSq=x~h=+jO{AhaEah z=rF~hkCey1D*l2*scO_=yAB6*=xZdjQq`%$J_BDv@zd$XKdMFged~vGFIC^y;R8DS z35Px<-;clt2-qH`+c4##-(j2SUaF4J;g#J2AFJUsms_d^bcioiGk&KIyLFgeE%E+V z2?y3l*vI*NO1^8M)V!?{f3^GY61+we(udZehv}T2<@W{6U#|{-sl)%({2IB^ACli5U2dNa(>knZ*Zi!Nuu6wL zI_%S7H{)mdJ@Qe(KU{|sbQt6?YY(057p5!ut_bCk-zts&!FnEQhmjqWzf^rmhaEaB zVmp#@KM9N;_CLxa-!W0@`}f~BQ%e4D_y77qxBkS&!R0T#f$&O|PlwZW*r&sRgrrw| zTf)9B3489LFe^7f^!s2vm8!33eZI+|YQWWis{vO7t_EBUxEgRZ z;A+6tfU5yl1Fi;K4Y(R`HQ;K%)qtx3R|BpFTn)Gya5dm+z}0}O0apXA23!re8gMn> zYQWWis{vO7t_EBUxEgRZ;A+6tfU5yl1Fi;K4Y(R`HQ;K%)qtx3R|EfVYrqHgR^s}+ z2k%ECL}35S``cp?<9z#+U{#8@XnW{Eew5FScTn-DV&y3SUA$@QX;iAxYQw_jcXRJ3S3pV8gaGb>cn*yuC35bWm!v2q+vlrePcs39F3h9iPl^g zZjI%~FN!wDLec8*!bo#tLvwh4$rpxK>!gd8e<55QJ3kz&XliH-H^tU048=kwttHmj z5?dCH#FoZFO{T1i9I*|J8kLY7L>#e;kP->iMXocJX4=$I8Pp{5#%ssV9mi&ASEph9_Ust#od$C{#csi9ayL{(OY>gpP*5!RtH zYa-ySrjDQK0rds0YwDWU)T_!`9bLO39BT$BiM7Hi;HEItTiYBCL!#PPxDJfgu5OCN z5Q`k)=(Vac(%jq_sz$`B1?QDfx!|Gc!WKfU*L;v(>cKifXhc;~DPU{Dq6;rt7&vp5 zs%(s{MAg+)RyRazDw`uKq9NqYiCi6uAft(@Z;6FlD^V8M%8hG@O6)bw4P<&mHK!y* zh;E?mSeAk2SX1>%=!rt&6k$z^gmt7Yz)_Q6VZdLy%QUzJt zuWzng9$8UI>Iy~GFA54(Pe2u_^ri4&jikj&b)%<6eX~#%G&IH{4N-NcXGLAZ@=zU= z%<#RQLe+UW@^oE^Jg85d(5!yqiPVKF;SIvkX3F^zsP_?4UF6!ZN_%RNtp0%P-JgTQ z8Mpz?wIH-c{mav`A_AFSDJ)W*9Udfg-bP7H$kkLCQQs>F*M?f^VwE*Irbazppdj-P z3Zk_QYI{ME>e@uvx^Jg@`a2#^WnH8>rhbBy_B$!Ai|?Ix5m{{(wa@}F)U4hq2(4C+ zqwwxuP&&stq`0+E{l2J3_5FUh#2*x@3=+HF9xm~}3)NecxDSbk#KPccT~UqNP(+Pb zEAy!$ZXiD{YOI4Meo`bA`Vw+=u0!`?bUhU*qQ|`M#6xJY#hyjdX8cPxk?IAN=bHbb8XBE^oItUD)mE zESO$3z4KFD1?@%cp3cI~qI6MbL8r&p>22)x_!@nsorhLbwHI`b7&xT6sG_2?Fzp>E z=su*~Q<3(h3kN)hiP~b{&=; z*FK_s#K4G(PEQpv)Onu5*CmS7-~|$1hYxHV4wY7%OsPuUqT%Ti1m3LSzEcF=sp0m? z0{=|I>C**%O~aiF1%5}vr2&Dx==P|*F7QFW<2BqJ6nKh;`xXlvFz`hJFVV1kj|k%u z4f`*a^cD?QpbgURW({{~_}dy*mr44A2EJV2A8WYta{~Xuq*n_3mWHQ?1TGpO^0aIC z7!CJnc$$W*ss(?(hW)hyU##Ko6#`dlIQ<2IqZ+PSCGc7ech(7fn}!>s0^ecq`FlM| z-DlD@{FH{}yFN<2qG9>Ik5ZO~d=uQzkHWRsbdVx-?>rh zG!4slbCjB+VflWJQj0Y#-_cR3O2hI!9i^HzJbkUyXS;^w`#MUcG%VlQ!S|IkEZ^Hv zs$0Vq>m+}#Nxxm-S2bMvJ%RtM;VupD)v&r((nlN$d0_+SNIBvd4F@$mL&FssF4J(k zh8Jsi4u9VX-=i_<8eXMgOT(=imhUSmwO+%U`1?gl-Kt^vo{>^_YdFZ?3xfO_mhT5C z)uZ7ao!+NmCExi`ztFH>!@n{38Xh1RHZY*!k%tM~c!=oZI1RUIc)W(&H9T9x>oq)I z!<`zg(C{V=e_q2~8b-gRN>G$f``6<&TsnoTLs4`I>PNnxrqnE*F5ihldo%c-75qyy z+^zlV7c}hCaI1!^w7*@i;r0qV;76YwB7V9w+^yjX&EHN9_l(B_etozIzf}9@*9iu{ z@|`!O{-R;|E*$)g#&0ac1AbI(l)qckKT^Y;^CkUw4a;|sl$xSp`5ux|3pFg?QBvx2 z8kX-XDb=K5`L2>uH)vSCuY~?k!}9$lr8aB0^ad$^8^P2*w0-sHbouU;QZx!;{#Ob9 zUo>2Gn!x|k`Q>|f7^D;kzI>NVsbc{H1%L9Jkq1}g!K(zuU4CE5OaFEr{74?WD-Zrn z9{j%oqgR*T`+4xVLT1)ZKO+x5FAt6gtVc^qeK8MSmj~aH2Y2Pc-FYyk{iHmb{?GH^ zbRPWYJa}&&TntK1dWYx1pU8uKdGO>sct##PClB`L!RP0}7v{m2<-u3w!8LjCsyw(k z5B_2vyiQ=des9Z5|4tr^<&zwJJ(LGOl?T6)2fvvI|2q#p0-QMOV{9HgIS-zh2mABj zU>;nN2Vb5CSLMNxJh&+jreVn!ab1tA4cC`&(a@nC*IHaR;ELl~hpPkEjkvyoi~Mi` z*9KfkTsPrL;o6An7F=J$bt|r~wa7h;Cc|(L%1HsMSlMWxE{eppK{!ai#{Ru7_N_7#+yO& ztGGIGeO&V14O$y)0IygMP9 z*yh19cc)02o;xPu9OYbZpa_}*n`J!$bCx#B66c&XiKhg;WxRci6EST4s3G(cKOj#O)p zNwL~T*Q|+#>T?q6L#x7Yfwc{lvCwiXu2za`6ITRCGhW%eI@DOXyrs4_Oxp_bPa??sL5bpW1s=c z|JYJN4}xV(TCs=MA`r}jA0rD?raf$)%9=ye1zZ<~r^lX6D{{(1WelCt%1|^KuB#6< z(*}wI0#564+5pIjL=36hi3cM2bg}6YZfeGE6;N3#8XsV+VO2Pq!wYSAfC6o^P-Rpu zUjvzH8=62=9C+Sxw5o&<*hhi5)Lm8D9-kr8iJHztBBevJJ06bA>pwWo?sFKjdmM(c z-5i5j)!9xC-9?rc0`ghmxI9iME{_q4viTsuW`lq%7X%GqBGi)Q0nhm?P*ffVh{|IC zF?RWQwu{GewsZhP3P+clEuDb;;yEs_e2U9sfTC;;2(VcoAj<l>mGorw*HoKe<#ZN~*U<~c(T3?BFYXj8{Em1UQ;?g)` zTdB-CM(*y<)qtx3R|BpFTn)Gya5dm+z}0}O0apXA23!re8gMn>YQWWis{vO7t_EBU zxEgRZ;A+6tfU5yl1Fi;K4Y(TkPc-m9|N6`Oqxgt5Ub{rbF}S+%(1EuI>31xyejLEA zth^*}IlWwx|Le(%&@hfgD{~PBj{DG?@AfaB-Wyafe!J)(Fn$E%)r0I0Z(e2rqSqX2 zS>9|%<%F31~UU;vO(;GwU;|)!3Eb5AW1Uu!G*zBF^mClb> zRxT{Nq^xqmMHeo;gj0L?u9RPgc`)%v7ZpPmQdzm8AuHwn=?!SUR8Ov)WOHZZGC$(W z!X2%Yt5 z#5c(#XAoCq<>Eybem1ahk!T-!&y~x-{U=LKN_Em2t?7(4@%*3d4^jSbYq+|F4?0%j zNYct_Q>RWluPIa?Ufs~Ns(D&nWO=AzYRwviLU$HkQQ#Jj^1F+aIzz+Vc)_Y2N+rEg z89nEF)HZ~^Wgb;^m{Ryt6}aekrM`R!=^cSjTmv$u|9!c(VET zw4hcz>I3*E0!zb9^xk{({);deT#Cps$5BpU%{a6Ol+)7OL{>tVsBG$dr@fGVbNFkd zH=l1i5P#?4@D~~;RJwl-vp6W@6kJrV(_wd=2q$Zp?2vvZYPh}1qb_$gI8JqMt_EBU zxEgRZ;A+6tfU5yl1Fi;K4Y(R`HSqr@4eX1nm)`rLXUlsF)JDu%2O_v8dyd&S@}$DO zBTrhem*R>&YU3oY+FONZbVwXs~s ztJ4ejrbqbqj`pZqDUE4V9lJ4v{3o>^yAhu?6~FdA8L&E02F~8J1*Ey8gtCS4>d1rj?paX~Yll9#rj1CaqCVjMsT>{98}lSPuLi zPZqxz_{D4dPZWFAHGfj-5+|KWnhwPso=@iPD3&4nipcE!gHvW~&y=E8AwstwMF*=E6?`=aYk*3$Gq5K3ep{_>=v6w;&Gnf_zsGV)a78krY-ATKIGY@kY-q z`$%=oorj3*6gR2Jk?sZWxRmEJuND{k_XZ11+Es(as0VAD&?Fouo^`yGNjN6{Psalv ze5c2WKFX*LUp#SRrciA>6}*zIZGmh@FmIavF+=Gvjbj`%VxMFhB=7CWZ}d*}xA~b9 z>2pP6wmkFgZLFIz&&J|4k-?RRi5y0!&B#Z(QmiBB6ZHjrwri~A4araXoeUhKW5PFj z=4S^Ts;7@#??>%N?ZUIcXqqMI0)r0SS@%%0O3Jcf=yxXv2i}6kS3X5I}Qk%FK z<-(RW!`{1CpH~lVjvwi0A4d-Q=@TtQ<2IfNUb^B(LFY>xw!Xx+bu0&SJLh!Uo{^qs z!^Jv{%SW4(@=KYn6PNVT6|Z2M*|$KwR7Q3k8)w@j@^=?|$FVQ{+jw;=a5j=ZF?7j4 z+4*MqIG>#dI(kFrAzg_smktKC{fhpU4j#rbpE&3{RJYIgRfB4o+IS4&iyPHOk5_F3 zpBp#Fj~JZvuK#Dn^VG(Xf4Tma%_pmuMtVvIVdDd(=b)VzeCAb&s~9AFEKF_@li`*XG;braa&wEIF3TV)IP~}j6OxD7Y~j@fA=8lwJW}KunF`jp6f{4 z-WJ$tG4!!h_Y+S+2js`!ZFqV!^<7JmXWs%3;)=GsSLoT;1)qH<`Df$$QJ+Dn4$o z8u^{{i5Bq-+E3VJ>A1-rl;at>>IIMJoXX08-k(s$q&26qUiQb!Tf_@+UjuFd_`&k> zKy}qQ8&`ra?&l!i7V1ODpTj;#79$(+W6J)MDI2shphZ4ecgth0PjK`eufOc!n4W8b_AUe zU#~cL{WD}J8YSbfaTu=={(E1Xzh&PudMq}KEx!(XG=1j1pp`~{W1)YsZSk3L+h(v1 zt{(gcm4!5HoxqNvAMO9?ndHQ#3bn89;?Rj338wN%pKqFcUZKtHwh%H?+kqTGqX$PE z<)u0xS$COoG)#H+lHGup4B{q@l(Gpnwo3VByfAJXJ$F4*xh#@ z3;i@c?o<9_H*Vdx?;APey1YEhBk~k${<*z?U-(&W&(sgpk?g>s`izi%@w|fKP!8#6 z0CMD%;jpbP=>9dx`a1B4|JNYv>&Oou{W3PnZq2FNXAXJk-G*b)&mIT6JY?hMLeERq z3bl6;WSNYXSCW|0DTpD)!wHHj~^@^P4(F`udDF(b4k~m3y&Lo3Rl;H ztG8_$2_GCkey~T|bRqaAofa$g#6&OZX9e^f{~Y;%y(3{0WW&4k+=0@ZZLe6#m>je& zA-xUw$WDdUk(!pyFTQiQ{214o{AuJ5>ih-B&vk)3#P^-xsQ_{nf}hWEKa!QA$wQh=LTt9j52us(d)p?0GHBNLZ2SYmu>*vbgz112XIi|_oaLNPoP~q z@g!i96?n6Vr(f$bD6a=)#3WOZX?-|MWKwiF|8r~oW)l2b6-KRjtk%;q+ggy}x z&AULm7VW+Z^|rb2%E6Uh8Ru?BylFf1Oml;kMT2J%Uj$FG$4W?puIRGo1;(aVNj+MX z3bv7p$8uK+e`WZz-ARL|+GC{qArCf7$5_a(=WCrO^`Ex!dx)p<&9ymx1&uAQc}@2p z#Q%ETe|F)S>2^)o_%q})^+NHt0VX@O=@4%d!OO{JtZ?Pv=JDnkX@URK-n+m@SzP_& zv)M#8Tr>y>a@~kXB6mRr@e&MTR21bRsAyP{4OvNcL$VR@)@anGURt8O)mmFYu?^I= zw$e6fYlX(XZ`xX4yw%#;78KhBZL77dq}7+-_d9du+1bqosIC3{KmX6>!^1ph=FH4F zXU?2Cb9rVBJl+Dl|^0neH z(Z)@k!`e4>E^EJU0Q<9Y1P<>QBZ{6;>{ejM^y)Qfx;WtLBFFY@`nF-hI*!n>8ven0z*$b+&0Usg8ckuvc? zJ|*DQ%BS%V@`-Bw84CSb+CEC_&rs;kQmsE9i+mRJBA*4B<@0^;-lOkAf4=R=r^%7e zBa{#5PwI}mLwDF$t$fNH`AmX*82@kUBNz3;<3$dSPfYguNOLA0H%)21$>H&QyxXxN z0v_q#&|X2qL%FkS`* zCdZpiox|JPIu9s5OZ`4-ZcujrfUA zmUKWbPV@3&-p{f*Z(`im=Ff5+Y*)aSqu0T#FYU%F%*8fqnwA{ciZBOr-T-8}LiEk( z_2t_Bw}F1nBifoTZ*MC-u6+|ij)8B%W@))Yo?AOV+m1PumU}>8%=egoTA|Fr?6{8K zSy@avSqA1A3wJlGj$fdxL^I~I)Fb5IhVp{zPuBGjm$rv>UyTO+!;uY$7Oj=AIgKyqv+rNnU;2Khq;(>Vx-GWBu1h4_ zb0hTu`4{W_A(<25oUrzb+mPSTI=G$d5`^9I3O$`(a-h0TQl~Su;JBI4~znI>-*vW5os>QW!&^xiMdTiP(Yq3xJML+$i z`qV=|{klD&bC56e8{>qg!_!a3voE1Mt)FS-+3}OKDcJA{pqKAsFeZ~9K02+iq~kj> zuBbvY&j_4_@f35kdyY@q?ZENE5AaFPreVpn9&*F@9kOfBsMGp5T25&;-;R}@{hHEC z`%ZD%clRuBo_di#Q-#1ounCblBr##aStQT$70p7k}8W{+mRiS9sbe4TS!NM%2Ltz4C?kNi zx3QRkxe#1z%>9P;d&f;K@}wqDjrSPdz`S%xdIA9MxQ(2p`} z|Lz)k=@_gvjy~`R)>Yp)2K##bRQG1=i3BkYsLD~TC!x;W;$xR_UHl5^Z++m~ppG`I zRl)}8IUn~-3psw&jB0%qG;vKj(Fb!hSqtO3@y`(d2%ZGS!2o2$eInGQW#r|Lk81s~ z(BQuH3Jr`wiem|9VPtKcI_t%h@^%xE=PYL(2yF`L4_NwU)h%z|;Cj8Ij zTZ2AM+Ut+sox z&{e%h1RG(?D4M1^il8rTsGmL!X(!z_E=iNKcLthv4+SmbRmbaNRmU6HyWBehbd3jH zV?h)2l{%WhJNGg*44Dyz{HT}RfdT5>1m+5Fp+EJ-T=2r3Q(MuG3ocmy75Z6sDc_i% zvu?_D-w4C!oz@2&3OsstP=NDLJ~e9}bq%=4+mChs8SS$G`P0j={vB|28LSKY z*Ru?)_gx1Db{6Zn^fI~5a7KnQw^{igL784X`Ks4?_MskY%gB@E|3beR%Z`NhO!ati z1A4D}FY2bu>^>>xoQj_+w&5v2!a?k%?S_xC=XA9FbhJIjjlC08$D4yx_wS$wzo#CY z4w|P+yHgLK10GC0K-xZxGg>dG&xF~=)En9ez_eXlfAaPx`XC+q5lZ|jj0YWofq?s} z#kad{G6C`E6Wgq;2GK4h+ckhSDClJOe&|oJukT&d9rSD9G%?>@$#lI}Kd^Y`$r@)L z`W)NB>KFP^2l5#hJnezpcuv97H=$#{_}``u&>`)ftS6n0Othxb(ks0v`$*}11@xYt zf!>p4j_lDZx^hT*d+?Nr-d^}}XzrCS&~T)D{mkkw&ZzL*%702`I&%@DiWPRaZ zr^BN+lm0n+bvSyDtS|iM==J#O(f7~}|3Y7&Ew96KfcBiWJnakzY^rzGzTI`%|T$_MoY!MDbAQ0oA==jPveZ9K999QjVr|&8J>^X zsn78p>?Hk1;arS9kG+BCu@ji9%Xw_g3(xdwzIZmfc@)-$uTHMX;oa^Hd236EE3*7D zo%({u?k8Ygw_VExbAQ+r_{!iX4NuDh{!;+*DCFF4V;^sRe--4T*A9`N=O=Xfje*uB z(nc(sXTz-C@hsS9ab9Ut>6rEaeuDbsfyQsrGDFoMNLCz)f{b`aNc2)^6W`G${_k#E?2y(WUWg2(^-{FL>O;ow#4gvfyN3J>@D z1{c0ecR`9wG*8;+_Sv}`^GyODSW~U-W7kGBo^BgG7dgtCXJH>|4E6~A&2qqeD5D%O zAL=28!F^NY@Qa~`ki$a;mvVRxc+?9%&;iW7jJ)K$x~$obY5#=y3!M9Zc*8ubZS*|X zNIhcuQ1m0NMeKI$o7EYsd)fx3=+T%1+*9Owfu0*8Bu(ZVr8B33EykQm&%JfuqfMdR z&_1VHbEm9F9fa%(k)LI-F1>e3U)j1X{cZ#UWs;pdP;<>L4JnzZ#(b^Yt z=CW3%KSV#xDAPjP3b7j~Psb6L_FA3>R^jq_W=**_-MDTKA^v6$&<6E`AskM0lxlT1A46W7W&jB`8J`9 z;Yg=GO+kKL-+87!ohMJ*$6bYOg{?j*hq43jURi{zrM%yvEp-`hW+EYSw^cZ z1UkSz1iS+V5B8!v1RUBHKGg5ELVF^ec8tN^H(j8m$nMLh(UtN|m!%(T7wPotJtO!) zo?Z(7>ECo|db^5J_?iKlxpwTyhrW#;@&S)lj#@rR-)2|g++tk@c|OtMnfbVuJWKda zZ?hJs&DsvpW?kuRru~i#Z3e%CXA!ocE!zB7oAzikw7GlM{}^KSlx*9j;4e4lTT%|A;u+t+x@fU72pizcPGBV7`mOdXx7Z0ew-P_4a&bN0xyn@U2fDwjupJ z85g9zw45Z-YDwCWq*1e$NeSE^E82H0R}GoOH((_dFu321#g`A04U?b8I`TFF+o_qwQWA|wdI`FlY|fQ(jx2c+bJKEov`*!Xib@OAg<*Q z^x8RxwLzTQX?Zw&k>1^yN0@zBBP+DQuEG;lif#LFu<^BRKelq!xCw(x8}=UX$OoUB z$b;Li_>Orzc-UIxBh z?w3|yK)zdEL|n?0vVh;P3Ge)Fs}SwV@C3wj+{1UWdLNRw>3Y-E$DXl6njLp+nUY_R zCte#Fz0q^tG(6o77#I4(2A8qF=<}r5Z_8`a=SlTBG0@dl>z%RRTJ{@#x}DO`w6&rg zhG-s*uKiPGuE^14x_192r(N4bM>z+zZEZu{r@;gL8 zx0aT-bNzq6oS8XzzM21Ud<)pKrsrVK%bqnwyh8k9)DwWc)O(^xC;f?Yob#s4ug}Ac zI$+NETn&0g>ancNPv1z+vCh_Wu^G&7kMS=7UkvLRrq6KA*7jlSL0a83KIo2FULQsp<&5}bA7fs~kLB63==7iV z9RpgRhXK(qmW6#z)RX^K!mbSp9{biFO_RZ4-&zToZIZFjmPfoR5bu_y`<0B3x?k|D z1bGH;zX8uSFKMyT({zumu8t%bp+7j8e6 zx?j?bg*tC;&?0>VxZM*VTU~!2=n3|)Q}heEz8`CU#T+jRe=;0;))(!q+f%Rk317M{ zv9~9n&T`c0mPtEH9HuQpn!8@8@wmQ7{Q~XOFYaT!L3)wr>!cra3Lef*;rzP8JN+!` z{~poT-G0s?mf&33V%U~Ey(TvkWgPVL8{Xp}zoFP`$soV6ID>$>JkFHp{fph@J}tjf znRkln;5{sFa=jLFU(oN_8T9||8Y@HgH)#V+FXZmo0PN{|HbCM%8-O&8kF`=yKZrvc zfbu*WfO>nh5%7B00KxNYfZ)&ugusty0~|cvE>2lJY(QEYQ3jTlHW|}woNEKlWPMg= zrl6gz&QQLN&b%;CbVkb6Is+W)%ukV)U|#A7+9E02q>T_eWn=~$@dfG;%DRktgmOlK z4)hVDNANe$w-2pH(7_LHSPDJ59Q$DAeBzft2lxNI{W=+^^w=crj=6h#n~a6DGu%_- zJb^TG50rM2b!#3_ho>KYM?WOq(+{L+e7~a~#G!tmEUO>;`lR|{wq3Sj%q(M{fq$lT zLeqfuLr9%?4Sem8aUmU-?UF!U#PxhGcWi*|)9nJ@c0=YugZIr8WU*b-4*j7l3Lpo) z2O<5PWy6N0_zyZxbpJ_|Y30ar()T9aH3F^+JPn_L?ZJH+`VGv($IM^Fr-q#=5qxgWciHd5;A??U<>b6NkK_EVg5U zHbm?l$Hi@|*ZS)idpv&~Y4q36aOp<6rpFy;fQRzmWtsHX-TQ`ER}a|>J>>J7f}hW} z!ufD@Q^|ck++*@y0q0O=p4DRgt>!TY>b0B?BYTXQ>9Wsvc|f}6!SRQ5+oj7Mc39(~ zk9&OxI%w?+Z4u)=*&|KkLtky1Y8=WQWog+X5A7}SsP8GVM<4WLk2K2uSCE6JGnx7* z`wV4|GWA{zrIm<@zLjQ_6|&de0EL z2ifbs&N%25627I9Idf>3Gl=aYN z=Z+ERjP}WJelH}x`;czz*UPtOW#~V&JzO^{l6QTc7&?}E<{^2vUdp{%odwSqVXR8= zx6r0RtTU?q{aP;veLPD`KdX>ykHLPeIeTPhyJ6(&zJ-H3?^(4*YQy22A-8antZ`-G+BSKRCSyW8T#o!n(m+Xs5MP;{(-!0?$fkzBI|`b%{)NH z56DWNt3{~orRbk0^QL~Sg``8y{Ns!$*52Spf^U{%^+~r04Bq2J7~@myc}KJo=*ylRtkLOj#cWydSl%l?f%rPr5CpPW^e zn=FTYnENKLij2@-?`rd#{S>Z?ZeyMdV-Lqy+P}{`G`M{n<(NJWJla2&$vkYo{g55` zF#9#hwSMejEaYB#3G`C!4)oaHr#>i*J-47v_Ll_uLW>=H(6{wj7Q~?rou<#F&r;@m zI?66O4|^QI({<~)p|iIFTS9&19ue;Y(z-dTM9(!ymv=6~wK>4!y+))XaJ=km6v7S> zo(6rhclDqj2lDaQvj>2AhHX7%4qW@)J?UayDQCl6x?n?Hy71n?Z$$T@ydvm%z^Bh1 zb1x`KZ>q1V?REfs>GnX|ChWcd-tAc=?>jTZwb?airsts!Ja!+qOV%5TXh)W?e#i?l z)OzdSCb&0%KIH8U0I!fXa&LdV?qv7*{&uw46SU>A?^0)2uEu|0fW|LE`@RKS$}1_e zq#k8DgGio1M>pq&zeQfkeGGKNm9@6zGmh4Jm!gZXE9qxVv@Z5(df_)HE0Zqrdnwv( zy$=XHj>)*h(D>1?B}J%P*SG1I*7q5YI5p1bYMJON?aGnrYf77Ua!tH1&f{gU@#CSh zW1+L-(O#4Z=DPv)#Iallmbea{WiOhf)+fg5Hth)Du8jch+6b%}wMeI(mrT>}#RBJ{ z4=^wG05?s?nSSlVHZ8n0(DVZDLHitKg>>DPBMVxa6~;RDH@|<|nxxG&X>%ow`2)BUv1p*uG<6+(cwtd7=w$q)lJ!h4 zMxW*P0s8&ClJ&e##KJ|~+jMc$)8{B%Mpq8%xWK%#y^5|t9hB{5B8y_-VW-f!%+NU; zbn0)y;Dd1-(R>f|8NN@&Iu7a{C^%fx)HFiA#iP`*TboDBv~XY8!~N)U#Ww{O>9qTj zX~j1cn7BvXxM3#l$q_RtSMumX*bE*0EAEdWO{|Y{)oBR*Nc*Fty@7u0(KAr!DIIC( zA#CYbgl+(I9cfkiX{5fo}>7GCWBf+D*fcI16$e`NgQ>IGN^E1i_;)+7g#wt zu*JDg;x4vwa$t+|q{J0lIXST9?L{}v%E^tha+0_!q(1*>BPYVPzCojB_U%xu#qhI= zH=ofu0k*u~o}2^4p^^g^gcN)T(KGaqCDbw7AK3R!MgN36a9(t#?u&#$qmEnT#ub>j z3O8<;iEBU{`lBD?E$3Si)DbA~y$gSKF~^RBi&O`{QQHR`-G4cLBaUf_MI{(-F;~S{ zW&Qphz8uEj4{x{-XFSaw#%Pr9o;%?v>ZH$K7tc-Nl!WckaLRvT@R8iKT9wX|u#tZk%Z|+=Vxb^;-Gx z+|565k3pb7z3a+nBI>pD`7p+iKHj5~P9N_I)wGB{rO@Z-lt-VAOQTQ6^-kZ58R*OW z&Et{#Dc?ewY>y0n$_7=0Ksb(F((Pxk+sE#eb)%{-dR`XB) zfi(Dmi~hm)0QUm(Q8(XN?oGoM<Ll;#k&`0&8DEc-yO zDg&9bb=pwBy^PPg5?O3!P~DGxVDMj=sR| z>1emu7P-L3mfoJ{<>}MVpCt+6&G(bx6B+ z-XYdP()o@<8E-!P=RjK**Mb~Y=b2*G&Z8LRc&?|3E?FqHw*o^BKsOJSA z=6E-wj7<8(_G0^$je)!;8GRaa8Tt|8#ws{5!^{yuZcD)NaqiJ$*6I}0tJhmkw?{4QW<)d59H#)<+fK z5eHgmy^xcFp5_E`u3l}ff1G!xh^@Juj7nh`%%QT z_ZBh@<1qdC0BGd9ZWoN1TzCIF+XS@cQRil(56pJ$@#ywHQ|5>phB6=XUvYr_I)%O$ zea}}2ZKSD7>Sdnoh$mlrPzLXe-i^8APU8BH2k%#S`-8;YD!4xfZg2Hm;M5ba=P;1> zL0#q*2Y4qv>-&+^_bJF6XPzEx^AF>1l5`(D2haIt-!E}K_Z*k$y^Ys#KLKSD&}R&0 zx8|e0_Dxs%ynkY~>R?-QUVU&Z`^yzLgNgRUy*`fzlJ}(E%Q~I3J@9Gh3t&$2!d}cB z-mLJo9`DfKW_5c?^82J)P{wY+zeKq_>%sTY$deeK#92oiz}txf-uK}BKHvoHxj4{< z{T$k-7vLXs6Bi#oY>Xlw>7bsH7tQN5!|R?-oLwIw{LZF7ljPCz@a7_%u|}QLLAG;I zp3%KG$8x^x)8{yJ*@Mt0A4ME&oR-^I+=qgC1Lzm5*Dag%+VWp;%eH%9Sj+2@eFv^H z!uV|5jW*!>FYung8ZYFyoo&bOtzwAdyM34*5WA;k1-J~dSkarTklqLBlvy6aLXq_z z$eFrVV*O&^wOP9G&h$A*hdt7?P`B6yiE~gt_vg_LnnslSrwnxOcj#tbodhVwv|!r#s{ zV`(YRl;J$t4a4xg=TV&BZs6F!`}}DKH#d($KgE7O{0n>5eDfmMzdzoyux&E!;N#kj*=V9}M=!vAaMI#|Y-<7^c&w9@lz1;weWyv?H_i z?>a1p46Z)l!#eXx@&k*A`>Shp+^>%qd*NfL z*?-!KdU=jT(>s4?%Kp>kpiS=~3QsAxCl2#?pP$BK4)6B|e~@EGb-?n3ZvY_kE#&*} z+J-IUeDZeKj`#Z{Wzh9;$Y4<~GFX&B273)(b`NgIp=7ZAcuxlX92t;z^7=UVVw?W} zcdD~pdF~%JRPVv)Z}YK!pubCoU)@#)V=#wbRD6bq+&cgbaa`co?=7^JUB( z7PFkh!|>s7u7fbwb2ttLd}B^w9(<2B`19`^ydP;smz*@_4z|nFR$dO;KuVZ42|TPgU>e#K+PvF6u=mF3O-2 zHN#W-#RkyUYriNO;pxO3z_T)^9-Ik1cx+M5^8xUu?}ZkgDHqC%yi>-LK5pJI4rH`# z7$>+Vozl;rHT>BAaM_`F-#gOd{roiEKg9j_oBYePj^sdh=8Sygl0xWCA#_K*wC85( zPI`O*Ha6$#^FJ&MtQ@U^q0#qvbC#a=@gv)LjHwxA!ST@A`Mu^hCX0Nkdm#AgVdpoE zZta)G?@r$L54~sqE=J$Md6(6jyt}b`((iqD4E(l3*!Qk<`wl-KBmL)?wq#m9>i2B? zT=TnvwmpA+l-y-2Hogb`VDr0tj#^dULg2xqUJRYZYby<5$o;{<~ zQ$Ig)|H7OnW7|!4`qzvTJo(Q8Z9V$e;IXaK(`equdp$5t@th^}uJ6`n+_#TD*7R}M zh$+4BfVq@sBVHTp@es(w!{aBm=A`ie2ODSFjGx5ucYw7I;HxFC;B-6oru%{)xh*F2 z!p8)MkIHc#A3w)8>^<7z#FJWgA>OqEcYu#6;#YufIp_9o)S>ac(2co|C;w+p^5|~M zMEAz=t&gP9y$p1dk6yX=j?Ug>a2uPYYw;0Q-xjBBzuEN_=@5~qr+IsQXb``Fe;OWlsY4V|rwv@tW<2-iFV0`O<-|+zd zZOta6pTEbI1KvAxlXCc2d{?ZiWVERxGRWaX^E+*JEZhUydX>YDu0Qu8% zyKaoRdaai2nQmV`vYpra0vXmWu+A;^a#!KwNm(ohU1@fHS7G&(*2~jm#I@&K0BX5xNg1W%qCR%@x=XtXJso9KGKSK;PzG2W-2(%fpkM^P4LJ ztn83q)_ryrw#;nplOnq@?ax{Lg6;%xKX-C2(3AG$T;M8aE|B^=4_veI<^q;>-EUIy zH0{!F*mjPeysL1g`E3!~cYf)Yxq$G}1OGtsw@CgMxJmmkrv0;)Kde`9&mxGnRVxOy zz70J6J$y0Zv3A$ic@^dhS7~4EhxVQV>_0#cW|hert^RI<=SZ;^qxB8*Fos+UarNyM zlx^#I8SmVuiCa352j4|{`4UT2M`9`ZHtMIJX!o)i$M4p;mqFV2PQI`{uFt*cGj9t> z2WT9?_5I}sipS}>&Rq#Tjw2rMKAeq1x&3rH`UUGKmh%ldFXEiMs}m?w*R#OOyZRB4 z2iNHLz!yj$jr_82@%J9i1&{i?Dbn{L4Zp39Zxfau@PRJU$vD=_Jf{N}{Y$U?>#~q; z%bJQbT{rW9e=QH8HNmnG&$1~S;Y*ik`}tVOzaMzysR(V0v-Yctw7u&okCVZBe*RB} z(`K?Rod-73wp|sVZ|H;Xb+G<#?FYs~&wiASZnt}) zyhn(9@^>#<3e9?$t#cmhX*RZ5+k4GJ{_4bRX&2ldk{IIch0*t!RW=|AbKHLl-`8&{ z<^G-X-2mS0cLO2scY%)V{v-MJP=D)~aSs*!*t0?X&F>#_Uj8=d(DobSzh{G6v9>=Lcl5YjihV<~*1W6m%xNj( z_V+-m_Dh6^tuC%g{$ArZ9G=+UKL`HUetKOMd+_Ad>QW)}qYyR-cG9#H%1ruWncHlR zH-G#mc}M@u*k;FM;QevKkF~ou9*Xz*=J)&9&h-xOx=nl0-^=v3i_mS@B}cdW@jbmS zazC2=Z6EXk`T`xvD_vWdCUY`OUaojz7?sx0o z2m!v-=hajsGN;UJ6~$mj7(8;r7PpZME17#G^DUHdz}Ylk0(`*g3- zb@R7En9g|=zvToyck%ut+!v$y5xdoocFXpOQpor(|95bx@ngp5dd-=p^YMLJ&wE+Y zZIIT1Ss1TSk1cZo%GC7_#D2&LvMvvL#tc+wAMWX6ti!nxjRQN=<=Gj~47&uoGsEzY zJEvfG9tNNMZFSa_@b-!R^LFPs(2>dRbRnMfYMRj&>2_y7(*Lt|2fEdZ-T4A&Nwqr; zu48xZb9kcNX#;;=+lk$I3}=#B=>PiBHfUG2)y_%xEZl>$9(JC*1!rP$zyf33)zDEh zoeJ=x;^K4aIc4V(?ydTECz3OAbH7o`oH20W`w z;yZD*xt{L<+{4GRcuo#$E#B`+xp{ei8T0Nzd%O-jKl1yLe=75jRL6G7`5(5|wTR>W zWO_UWoO+Kz@?0VA9@$lpgZ9oD^K<=vl=I%#c|Y2DKh}9a&Uqj1ypML?PjKE(a^6pN z-X}Znr#SDYIqzpX@8>%2^PKk!o%c(e_iLQ@mCk#W^M0-K9(CU9o%idU_v@Yao1OPt zo%cJO_dA{UPdo4TI`5x#-XC<{zv#R_;=F&!dH}_j|J!;0 ziSz!P^ZtVK{&VO3m(KfdocGtA_uo11`ioDzynsjF#R6^S-Xn$feSNOYC0O0a@e^|4yiJ9+Ztl==>XIj&*KxCS-3 zA*N67|lNlOBmiw8Vv`hH$(*Ru_-Nq8Y17COb97>cW|^nc(2n)r8h(ER_ikUPTRbAtRzr zNx=+<>N8>rcNH~2Ufs*jTA zkm{SFL#|%;J#s3?H5?IPL^HH3owM+g3obeTjNk>)y2g00qB<0fhHHYgp?G~{T`&^8 zE>sh#oE?m;ipJ`piBR-^KF7tW^e>5qR@Q_m<=RkPFce*HYi%$cDxxV73V;=BjDs{Q z?~j-}rJd&*i?K3Pu{s>Bl-@^zpuYPPoTGwUBqB!%#@OQQWA|t@kN1* zE4?MBwdkT)Z5Tbo={60)P<=Sq7-jRJ1BaknYa=x^y0KRxp&?x9cA$@1KngDnYte~T zHda+(2&@ldl&lX|p5d|5OKM69L8x0rbtD=NqBBI;{~H?42#%}t3h5motsG-nC!JkU z6A4G-fHJ2+){P!LN$Nhd1}ryHRlvHXS$j*L(Mr=%{fiYIbF?}spiZ=(o{T1 zp9X|!z?cSBupHo>0=!dzcM9-M0p2OVI|X>B0B<_*rUP&K zDXGS8G2Aj*W20i)23JMU%ju=iIHAd_LX9PZq7F>Luni7sz&;bs`CRfCwRcgv)4M0mZGv$U`bx9*knGD8JysJg=P&BwG z99bF0Aa>?;v6_a)=&F)XL*wLdW#iduadiZPof&HFmyc7o}^=aIJC8)>)@JP9;|{VZK<3Ss*gp3WwDz0^|c`N%uuy?ErErb9FDH4pWFyX zcydMPY_$lsufcXz&=3kvMv1yKg;8%}=|t$@#B=9QJQwftCzdXpcy8&$Me`>@OBY@+ zZyu{YPgT{%gQ_wV52;Y2nzJN@mZg!J;Kd=hSHUya#%oV0scc*wHgd{Pb*RzQTpwDi z7S353YzWoXCD}@qJM=HIDpnG@J|3=^>>fdpRl! z=i|DtS{YfTY9jG?4PNztQXY@ghNZPUx9?mt)-WjuL$60V2yEKaskN|dM~DW~m}+;D zu6IK`1a&Hn)raSh@H2usD2>(DVT_K(=Yii#!t3G~?Bb2}QJC3Fmdu}Ty~BUCm=tT9 zTJZ%@P!_ESUlLx6X+^lc9>WIa1svGKIv+9qA!=C^j?dM@#u3%gD|XKsmS9u@`la=l z#?)ib>y?2+BBqp^6!x0NaQ*sVZLBg<6-f?!)uH;zwe*NEMA3@rd6XlskDNb+isXa< z)z}^^9i~1Mhg&Djb9ls*a!X^4uuSyRX%r)?8o|i8N^kHphR`eg2(gc(hLsV^#^FkL zF%MgEBpMH|f|HnHOAc8>FF6idlM#*MO&+qA4A_UQp#k$z=-CmpK^o>^OKyy&ra{40f|aGUIHq$Z>X z1?%9!eSs{~%-NA=NU5h3i(1+jVl|npOz#LO zpx57EBZ4qsjbWKa!RP21BNv@7BV1AJMv$NM_z!`SLZc&mJszeMnL6wo z32F+Rb@A$YXjwVzT4nj#P=qUuQlxNl2n8A*8eUfyu86}7MH_430taJNqCi-PrcZ)JXitxh05_%i4_*4W$|EgXV=DX= zs3xVhshOW&qtt_+KZZH_O<~&!uR)cAJ*8Y!qNDc?R+!A0=c`)`B4ONDqWY`J>KV!XP_FVX!@&YX z`l}0-S}{)bnLl3TEg!Fr8a7Gg;m!@U{S=i`H(ljEFkPv@4CR}M%AYw;<=!?=`TOGn zw!bV;{;o@vs$8Ue>+oX(xZ^A*uvn>ei&aiL!o5qBFZXgB>b_j%JdW`0Yn1QtYm^F> ztDH0OgJ&x$m9ME1n`2>>lUt=!O_j=RLfBrVe9s~r8BzY3O-gO~w8|a!8PHk+;-?A& z03q2X%7~$nNkJ3&BuwEj#2&5=DMP|!nPEUee9Nifz7k@8T*EkrtHS{jVvktEI9sDb z$XtimFVx|&65@^v4Wk)!I7GtZBpfQ?FbR*BaJYmcBxJjj&QTKL4h{|DK6V`jB}CKV zub}A!3CBu!qJ-llJW0aw5*A5_I}-6%&~&nd6C|7{A=ChW1x=GBoFd^=38zVTiiA)V z{1r4oRdjf&gr`Y(x`Z<&oF(BI63&+JObO4@p=vTg_W!H|vJ%KjAS;2a1hNvyN+2tN ztOT+W$Vwn9fvg0w639v*D}k&8vJ%KjAS;2a1hNvyN+2tNtOT+W$Vwn9fvg0w639v* zD}k&8vJ%KjAS;2a1hNvyN+2tNtOT+W$Vwn9fvg0w639v*D}k&8vJ%KjAS;2a1hNvy zN+2tNtOT+W$Vwn9f&Z^cAol`Nw&5d__k-`6tnc`ElR$xbAjgCWTqaMrM8dK>!a+Rd z@8WMTEKo&XG2sG%FOzVQgi9n`CgD{QUL#>h!b%BONqDVmUJ?v(IH68>1ipGo+< zgfC0@s)WCmaE}gy6t4a&t7cH3E|qY(gwII$wvE@fXcVZ2B;0^Y+7&L1uzzet{{88j z{J%i`LqheWfyd}Ds4v%G%sQDxT7h5E^%bbsBuq#cUv2Ook6n&e7XV{0IprNqD{vlXzYKB%PN^eaj@QlyH}X+pjnE zCM3M{1_M`0I9KB(>#q{JR!X=|!iR)Tb8m=Jb-AX$oBKnQdRp)fE!SjwJoS{J;{^#{ zm2jEX6Vpz-(_@3SE6Qi?CsFFlU)g4^(qQ(F@b|rMJYlZRIKsRSiJZ1b_=JRuZ)5=l z>VsQNxcqY_-2DX;ZhVAckpJnwL(8Q={YvCF`&%|gHq1&OD}k&8vJ%KjAS;2a1hNvy zN+2tNtOT+W$Vwn9fvg0w639v*D}k&8vJ%KjAS;2a1hNvyN+2tNtOT+W$Vwn9fvg0w z639v*D}k&8vJ%KjAS;2a1hNvyN+2tNtOT+W$Vwn9fvg0w639v*D}k&8vJ%KjAS;2a z1hNwN|CcxK|c5KkP>gLr<3=Z|tl7{`uO^}p?JuqHOA{2<4dBE_@a2I-qy9iiH+3>Dv_K*oY)JH5((8r zuD8VK@{;wb^3r(=!!_X$sV$wiC|)0lt}3k$hvMO-k$82fiMRx;*R4+?pe{*CiJKpe zu8LQuL|q(O7pZNmT?7K=#p=(CR>Ue%fhsRAuc%(#5MNzh8LD3!i83NwUmvUIOKrHe zqHaAA1ZoJ!Ez}UL1BLM_4~~Z_Rud?%3Poy&j~0-aRgIzgN)uIy!XYfCR>mMf^IBgK zN){Zik9xI+;<1P-UwM7FKBmemLNzt93WPOi(#i-(tgO-Rd_k*$_{y4w^|h+JN}{V) zh2sqXO=6Xy7;t?ULau5Ehrw7?JX`~MtJc;>;)q3#aP&G=9%*Q(3soRub?Ll0tQVxz zU(!g_TA_pDsRaiJAsAK8S~OX8@oF?&WqCy`T3Ox@SrrW-S4!mCPy`ulRBdBCysjK| zfSlC0#;A#1(-5QLu~c0HUW_atWW+bb>no}u4~C=&VP&HUYbX}LQJdglA`(WUJQOR3 zLFpe+mo-#3qEXgHReeaUtx{j{k)d+6%U4&U_WO)T|Ib&cZp*1xzsgw~x=#HgCrXL@ zDz`RN5o=hd-pf@vNjgVyC;5Ndr+vQinn*)j{TL}PZD8C7`v13E zS*)l)6=Xni8q{BNLTlBx{JH8EKW4g)b$GbfulD5Ts;-waC4Swnevia=ewQinS-<)N z5})}q5|4_9LD8+bm8vC|{Z&NyRIcs>ow;>25X6sjO>_P)ay|4uixiH@=ce57b&-m2 zx%v`Px9HReT2*}qnZluZ^)jNLKs0zhpn1L>1BrU=oBV(G_xS(DAMyWpnqmCa1Gn@4 z9e42m#3%WG7X}OY+gtpA?=QX$M}0qUV{W_e?wlEwGZQCo%6TStqwj5h!4r9RA62kD zXNzxS+fjAj_Z8I*>)+C^vgR+oO@U|o?9Q!Twj-x2cY}ZLQ5$_LUh+NQzbz-wzq+Wd zt?J4QZ+IM)9T9S8gk7g)_T@N|J6IN!i@8HjK08&c|WfeZBgLrPUx{7Ve}jRJol z@Ld8|FEHt!7kK%l27XfD8y6e+M*^2EGw`nkZoAUJe-^mlDg)>BG4xdnJWAlUQL08@b5D;_>jgIV^(gg8fz7==NNQ?&DGFc!AA*IZB-*u(>x! zsWSvN_va{eiNNL_9i>77oBMQ>iVAG*)lupOfzACoN_|RTbI*=aUldr~Z1mw<0+0MJ z13x41+xp%ZrCt@dwV2;3y_83NDL_ctk3 zCa}5BNvSIY-Yw}>0-Jl3l)6sf7JXllQnw0h?k~c2PFLm z0{=qb9|=6n-2bC~DzMxKq<%vfZN5X&-xs*#C?k(RKa*Z2aDl*=3OrWeWdctXc!j`c z3tTPmg#ykGUUBsTq=P?uAn7LV^3AYw&5-Sl-@J z179m}iNNawE;`?&w+Otr%)q>Mi1}|6_z8i_f+l^Zzzi>TiNS|1`YdkIlsT9uI0z9V>9n=>{Glu(=OOsfhxcdy$lyE3mmwNvW#@Huo$k zRWGo)UkUmpu(@YRse1)B_b|bp2yE_aQmUOW_%Zj?K~E&z+;^qaD+2#Q?Dro8zI3#q z|L>CD+;<1J1PxAp&HZDrCx8LspZS}X249*6uQo9LH-Dc@OaDR|3?C+?{H`?k*J<#3 z2F56E{{Alw9^=>LdFj*B;CX3q#K4|^bbT7!oCde1!4Idw@EXaFSKiJv_@y-Xw`nk@ z|0(&g6p#YDVKdPvDXFAcsp4PKlEU!4Y5q`_Fu zNGX3!8oWLYz9kK&XA60F?fp<%`j#~K@icgQ8vIlmj3t#6`rb@~yVKxfK#AKv$ECqz z(qJsnq~K3ZgHKC?&rXBqrNNh^!AsNN6=^W9%i~pVH{!Vo4~Okf;Az5h3!Yo?G~>Aq z&+T~b!1GBwpTct|p1bhejprUbt$6Omb040KcsS&L7SH{79>Bw^;~vEGc{~r{p)LO+ zo`>;l!m}CABX}Og^BA5l;rTM2HauJLY{T;vJdfk~DxR<5;kAn#19(m3H}O1)XFHy6 z;rTY6@8J2UJhmWjCO$un_|M?kfal-I^A?o%@8lcBsi5L|L&(hjQ|J0lf=pR;Ory!s zm_Au%qO9`Zt+L0&o$1MGybE!Pn+BU%JR><#cc$bz%3XJ01Si9GDUV>vG6xZ4HH5Ev zeS|N1Ek&AeV(GitqLT;wt4x+^C*|{6-Oy-?vy#V0A>D4-` z1rC;8P9R*5#R~~DiOH^bC6_yh?5!yg;F6JqJxa)~>t@$=v+KJ5u614ZGBK|;F|0%z zi;AUitTF@Ss&S-3>?32vB3G`DhH6t1YD25TFnCq5@_1-v4VJ@=Av1;tkPuwnur^dz zzOu2ZD$Jb&^HOe>?Jb0D6)tpZ)Fh6?BBBa=IhhPOm*j<1W49Y?Yu9_WU0ZXFVr(S} zs=)40sNP~=(LaWzeQcUwyuk7$SLI=&2!eRfV|jtd#Ga;!tRX~$e|;Es9lJ8?kkh=B z$1wy|hoaGNO>L-wdn677oOLU?$e$947>e7)Lm}zqVqYa(-+=unplYcIKEQZvbvT+r z3pX=R0(Vl_809P1gQu!kJqk7EI&B$Rm4gZFk$_zePUW6`*N`1D?I39)&G6$5GdePD zw9s+h2%{lye9=&HP}87@Iyt0aa7fZZAe|H)mqrQW(gwgC4vp6vRjG!lHX5#tMI(|)D-MlOQhPnahBDcrUMc}M5d!zp@a`s2 z4qh4oH_`ZVlCC%Ez#aDWGzpUE;)~Ta{5D|EFto}@z)jFaXd?u&Q`}%kM_Roa{ni62 zVvSLBXHsbmu_shbI-P6${rxxncPQoO>O7`>`fo7euqxr7tFTF>u$_h2N<6ZHuZAk$ zil$(W>Tl2w_x}zLp(e626q{VR9-(R(-V{D-&1YUcu>I*9u72c=f!Ck6@4Gk0zWCf@ zr|o@X&P(5j{_()TQI{>6ee+Ld_W9bETPJNe>D2+pe>nfrs@H~m_pL8>-gxV;%KM)^ zWW%fzj<=b9i!&=x#gW-eX*&reA<=Y+&y*I%ZWiV?z}Dhr_=BHV`cGg z+a7-8l){THZa;40f-}dw^4yf+eee3=TVK2SXFngE|JSdN*muqkrf$CO$G86M<_k`J zc-gqp5v}W5jjiH0rUNPoDeM?d4VP4OslCckjMx!MxcQocHSI zhYtApwx=$8|McjR$o03b*fyZ-)~Q#%_lH0AdGAxPQ)kS+BD!bxXK(xE%-v7@D;hpYt8H1y0-lKzpi-n(T6X7^;eHQTJg#o2S0eI|GA(4YwV`4 ze&X?OE{py5zN#I$uRQYN43@($j({l@EW|K(G6m3?aBm;crDS5A5H2m7o4CwB3W z;_D`Tv-H@Xoc++cqiXkeb)E3yw;r9kWzoM{{^9bE{!Hml#t(Y_!r4pW4S)OEGmBqa z{L`PzyMO9zI^S9_uu)+9|li&K61>6 uTN?t6^(W6OIeTOHuMZBt;{DlIp7H2S=k(7#|J2C`zjS>2#w-5k_x}$JS9`Aj diff --git a/winlibs/include/ao/ao.h b/winlibs/include/ao/ao.h deleted file mode 100644 index e0c347de..00000000 --- a/winlibs/include/ao/ao.h +++ /dev/null @@ -1,139 +0,0 @@ -/* - * - * ao.h - * - * Original Copyright (C) Aaron Holtzman - May 1999 - * Modifications Copyright (C) Stan Seibert - July 2000, July 2001 - * More Modifications Copyright (C) Jack Moffitt - October 2000 - * - * This file is part of libao, a cross-platform audio outputlibrary. See - * README for a history of this source code. - * - * libao is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * libao is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ -#ifndef __AO_H__ -#define __AO_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -#include -#include -#include -#include "os_types.h" - -/* --- Constants ---*/ - -#define AO_TYPE_LIVE 1 -#define AO_TYPE_FILE 2 - - -#define AO_ENODRIVER 1 -#define AO_ENOTFILE 2 -#define AO_ENOTLIVE 3 -#define AO_EBADOPTION 4 -#define AO_EOPENDEVICE 5 -#define AO_EOPENFILE 6 -#define AO_EFILEEXISTS 7 -#define AO_EBADFORMAT 8 - -#define AO_EFAIL 100 - - -#define AO_FMT_LITTLE 1 -#define AO_FMT_BIG 2 -#define AO_FMT_NATIVE 4 - -/* --- Structures --- */ - -typedef struct ao_info { - int type; /* live output or file output? */ - char *name; /* full name of driver */ - char *short_name; /* short name of driver */ - char *author; /* driver author */ - char *comment; /* driver comment */ - int preferred_byte_format; - int priority; - char **options; - int option_count; -} ao_info; - -typedef struct ao_functions ao_functions; -typedef struct ao_device ao_device; - -typedef struct ao_sample_format { - int bits; /* bits per sample */ - int rate; /* samples per second (in a single channel) */ - int channels; /* number of audio channels */ - int byte_format; /* Byte ordering in sample, see constants below */ - char *matrix; /* input channel location/ordering */ -} ao_sample_format; - -typedef struct ao_option { - char *key; - char *value; - struct ao_option *next; -} ao_option; - -#if defined(AO_BUILDING_LIBAO) -#include "ao_private.h" -#endif - -/* --- Functions --- */ - -/* library setup/teardown */ -void ao_initialize(void); -void ao_shutdown(void); - -/* device setup/playback/teardown */ -int ao_append_global_option(const char *key, - const char *value); -int ao_append_option(ao_option **options, - const char *key, - const char *value); -void ao_free_options(ao_option *options); -ao_device* ao_open_live(int driver_id, - ao_sample_format *format, - ao_option *option); -ao_device* ao_open_file(int driver_id, - const char *filename, - int overwrite, - ao_sample_format *format, - ao_option *option); - -int ao_play(ao_device *device, - char *output_samples, - uint_32 num_bytes); -int ao_close(ao_device *device); - -/* driver information */ -int ao_driver_id(const char *short_name); -int ao_default_driver_id(void); -ao_info *ao_driver_info(int driver_id); -ao_info **ao_driver_info_list(int *driver_count); -const char *ao_file_extension(int driver_id); - -/* miscellaneous */ -int ao_is_big_endian(void); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __AO_H__ */ diff --git a/winlibs/include/ao/os_types.h b/winlibs/include/ao/os_types.h deleted file mode 100644 index 8a565535..00000000 --- a/winlibs/include/ao/os_types.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * - * os_types.h - * - * Original Copyright (C) Aaron Holtzman - May 1999 - * Modifications Copyright (C) Stan Seibert - July 2000 - * - * This file is part of libao, a cross-platform audio output library. See - * README for a history of this source code. - * - * libao is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * libao is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -/* Set type sizes for this platform (Requires Autoconf) */ - -#ifndef __OS_TYPES_H__ -#define __OS_TYPES_H__ - -typedef unsigned char uint_8; -typedef unsigned short uint_16; -typedef unsigned int uint_32; -typedef signed char sint_8; -typedef signed short sint_16; -typedef signed int sint_32; - -#endif /* __OS_TYPES_H__ */ diff --git a/winlibs/include/ao/plugin.h b/winlibs/include/ao/plugin.h deleted file mode 100644 index 77043967..00000000 --- a/winlibs/include/ao/plugin.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * - * plugin.h - function declarations for libao plugins - * - * Copyright (C) Stan Seibert - June 2001 - * - * This file is part of libao, a cross-platform audio outputlibrary. See - * README for a history of this source code. - * - * libao is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * libao is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ -#ifndef __PLUGIN_H__ -#define __PLUGIN_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -#include -#include "os_types.h" - -int ao_plugin_test(); -ao_info *ao_plugin_driver_info(); -int ao_plugin_device_init(ao_device *device); -int ao_plugin_set_option(ao_device *device, const char *key, const char *value); -int ao_plugin_open(ao_device *device, ao_sample_format *format); -int ao_plugin_play(ao_device *device, const char *output_samples, - uint_32 num_bytes); -int ao_plugin_close(ao_device *device); -void ao_plugin_device_clear(ao_device *device); -const char *ao_plugin_file_extension(); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __PLUGIN_H__ */ diff --git a/winlibs/lib/msvc/ao-4.dll b/winlibs/lib/msvc/ao-4.dll deleted file mode 100644 index fc079e68ed7dadd215da66c70496d97e2c972848..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43008 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 diff --git a/winlibs/lib/msvc/ao.lib b/winlibs/lib/msvc/ao.lib deleted file mode 100644 index 7334d167638fbd308b2d94a7cce75b9bf934eec4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7820 zcmcH;TWl3Y^t3!$YN1csLLanP5lBF2Z-FL+UJ#=^+q6X!A=xgy+jisaz0G}4A3>2s zjFG56CX(`D`ay^xF`CE+l7I@NF^bY36VW0Kf>A^u5F#4!oY|S#-R`u#cda)$otZOd z_RN_x=QXWatH(Nf*5y1_?fxxW=^l&G3f@^6Xk24;J8}S^2_Sbfz?>d{yu$$bHvtOv zakz~wLg6lilNJ;$1z>OxTY~!*6n6kH7{V4|?kWz0*dmnVa!6oHFal5-7}S@(mo0VvA5w!eKwQ1UD?GYzJU)0$YTtMFg6*XEM*qy3DYl8P6w-NF2A!*m#g~ZD%+dH;BgSNPNiX(v#tY z7K)jBjF@JIh{lVw>0NYk;F*tfMcJ1)1r1d+TG)&y#t>RKN$nML492F68HP{{eY49s zmQ-fMOqhDue32c8V`NjrwcTd7hMF{WcCMxiA?YH?aM+eAimGQiA=dUlQZrN-Pg%~h zft>FP>o3q0Yb7?O_uDLRpwPMkYcDtSkk%QEbfG+SY;occ^B^UCyeF9mMf;i5vM*=* z^*#1xaG=A-rTAqOx#E~+`t%&>pKaLfZGVW(Epx9SXu;d5aB*TM=`(~;;dp75MijK>@WI~tZB6S}}DvoB7T*Z-%c(Mxgm@=R6<_b7# z-!;d;n-a+AKjvoPB3JCjvEw$;$Q6(g!7d1Wg&ehgTW}!!vm#33toJ$~QU*TkE8-bp z(Mih_pn)qYaRQEW#UqD8ITed2yf5}TMtyviMFn;CN-6E~P&h1N#$**lU`-vbB|36K z2d2T9-t3W?8Gt_7`YjI`yOZ6uZF~rr!oxu^;B64{H!L?pdP1+Q6H^#M;7bH74cKoQ z{td#4)0}Pn0FK%5@y>-*}Eqvb9U=Re_1p#2}p&kZ9j3Lw$ERcI=w6_npc`})i@!)}z9tnZ= zl?g)HAOPEGkH9dwEH0cTKs2}rBu#^jAv^{}`J=C6?3H8UwG~I{$E&Hi9d&`#j@yw5 z&%X2iH^*^5);L*FBZiOy^Si)!G6p#wiuMa~A9d^5mjUM997tv^*AH`IIgGkELD^i2KpBC)8hnH z%R58bw<@s8%ke^>;1-=RWzsfB8Ll}iA!Mqu)i-!Kefn0-Z&*B_pPa!sCFO~wFG+(i z4~H&`hqA6?VSsX2k|^>FztZscv1$jmx8K-%5z8Kwg>e(%+b0K=JS&Pn86|mUS{ziF zkxy;`5w0EbtX{ojxCFUnac(@d2-!+X_YMRU_O|ohyH~N`LqEh$O(b?!F6UR8M(X(e8Iz3rycP8dJq>(tY8am^ zFy&(&h}DVz;mj0PbbN67eX^oFOBQDx;ZqKkt)BmI@1Mja-@%1H1^VQoI<2)YJ^3@8 zR)NKZR}+3UU$4;o&gT5Hlsy+(`k<;?szY>AjW`YRzZ`aSU;Inu=mPwHktKn$X7ekL z%47Fum;OT@yO{IyJd6sVq?oBn7f?ud=yUxud|bo#EoPsNGSjb2DjmI9@Z&wwQHiA^ zdc*K7g-S;+e|6|O>8R9_LRlbBr95{oeSC@JDdY0sQ;TnTRJQruPc65|Hs^799Hl)M zL$FI(_lo$IeDBINif{96E@R#d{GM4rk?V|@zhA@WSA0EXH_h=v!Cxc%N~Yj-x$U`g z#H+%=%k|9RmzTnV+6GQB3#znv@%Izor>EfZ>(%Z%WT#a&m;dNXWkK!8LH-yRx Date: Thu, 10 Nov 2022 19:33:54 +0800 Subject: [PATCH 03/13] github: remove libao and install ffmpeg with speex --- .github/workflows/macos-homebrew.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml index 4a6b74ba..8a646f29 100644 --- a/.github/workflows/macos-homebrew.yml +++ b/.github/workflows/macos-homebrew.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [macos-11,macos-12] - qt_ver: [6.4.0] + qt_ver: [6.3.2] qt_arch: [clang_64] env: targetName: GoldenDict @@ -65,8 +65,9 @@ jobs: brew install autoconf brew install libtool brew install opencc - brew install ffmpeg - brew install libao + + brew tap homebrew-ffmpeg/ffmpeg + brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex brew install libiconv brew install lzo bzip2 brew install libogg From f1468a5af4c7dd3c74606496fae6d99ff8474187 Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Sat, 12 Nov 2022 12:31:03 +0800 Subject: [PATCH 04/13] feature: add support to import txt format file to favorite pannel fix #198 --- favoritespanewidget.cc | 25 +++++++++++++++++++++++++ favoritespanewidget.hh | 2 ++ mainwindow.cc | 12 +++++++++--- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/favoritespanewidget.cc b/favoritespanewidget.cc index 5eea16e0..5facb8e3 100644 --- a/favoritespanewidget.cc +++ b/favoritespanewidget.cc @@ -281,6 +281,11 @@ bool FavoritesPaneWidget::setDataFromXml( QString const & dataStr ) return m_favoritesModel->setDataFromXml( dataStr ); } +bool FavoritesPaneWidget::setDataFromTxt( QString const & dataStr ) +{ + return m_favoritesModel->setDataFromTxt( dataStr ); +} + void FavoritesPaneWidget::setSaveInterval( unsigned interval ) { if( timerId ) @@ -1163,3 +1168,23 @@ bool FavoritesModel::setDataFromXml( QString const & dataStr ) dirty = true; return true; } + +bool FavoritesModel::setDataFromTxt( QString const & dataStr ) +{ + auto words = dataStr.split('\n',Qt::SkipEmptyParts); + + beginResetModel(); + + if( rootItem ) + delete rootItem; + + rootItem = new TreeItem( QVariant(), 0, TreeItem::Root ); + + for(auto const & word : words){ + rootItem->appendChild( new TreeItem( word, rootItem, TreeItem::Word ) ); + } + endResetModel(); + + dirty = true; + return true; +} diff --git a/favoritespanewidget.hh b/favoritespanewidget.hh index 4a05c2e3..a0dae00a 100644 --- a/favoritespanewidget.hh +++ b/favoritespanewidget.hh @@ -46,6 +46,7 @@ public: void getDataInXml( QByteArray & dataStr ); void getDataInPlainText( QString & dataStr ); bool setDataFromXml( QString const & dataStr ); + bool setDataFromTxt( QString const & dataStr ); void setFocusOnTree() { m_favoritesTree->setFocus(); } @@ -216,6 +217,7 @@ public: void getDataInXml( QByteArray & dataStr ); void getDataInPlainText( QString & dataStr ); bool setDataFromXml( QString const & dataStr ); + bool setDataFromTxt( QString const & dataStr ); void saveData(); diff --git a/mainwindow.cc b/mainwindow.cc index af6bbe5b..0cec5a0c 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -4120,7 +4120,7 @@ void MainWindow::on_importFavorites_triggered() QString fileName = QFileDialog::getOpenFileName( this, tr( "Import Favorites from file" ), importPath, - tr( "XML files (*.xml);;All files (*.*)" ) ); + tr( "XML files (*.xml);;Txt files (*.txt);;All files (*.*)" ) ); if( fileName.size() == 0) return; @@ -4139,8 +4139,14 @@ void MainWindow::on_importFavorites_triggered() QByteArray data = file.readAll(); - if( !ui.favoritesPaneWidget->setDataFromXml( QString::fromUtf8( data.data(), data.size() ) ) ) - break; + if(fileInfo.suffix().compare("txt",Qt::CaseInsensitive)==0){ + if( !ui.favoritesPaneWidget->setDataFromTxt( QString::fromUtf8( data.data(), data.size() ) ) ) + break; + } + else{ + if( !ui.favoritesPaneWidget->setDataFromXml( QString::fromUtf8( data.data(), data.size() ) ) ) + break; + } file.close(); mainStatusBar->showMessage( tr( "Favorites import complete" ), 5000 ); From 1b9faf70f55446f893caa8a9e6ace44012e5171f Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Sat, 12 Nov 2022 13:38:46 +0800 Subject: [PATCH 05/13] add ffmpeg build --- .github/workflows/ffmpeg-macos-build.yml | 223 +++++++++++++++++++++++ 1 file changed, 223 insertions(+) create mode 100644 .github/workflows/ffmpeg-macos-build.yml diff --git a/.github/workflows/ffmpeg-macos-build.yml b/.github/workflows/ffmpeg-macos-build.yml new file mode 100644 index 00000000..79db44fd --- /dev/null +++ b/.github/workflows/ffmpeg-macos-build.yml @@ -0,0 +1,223 @@ +name: ffmpeg-macos-build +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +on: + workflow_dispatch: + +jobs: + build: + name: Build + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-12] + + steps: + # macos 11.0 默认环境变了,要指定 + - name: prepare env + if: ${{ matrix.os == 'macos-11' }} + run: | + softwareupdate --all --install --force + sudo xcode-select --print-path + sudo xcode-select --switch /Library/Developer/CommandLineTools + + - name: build ffmpeg + run: | + mkdir build + brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm + brew install speex + git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg + cd ffmpeg + ./configure --prefix=../build/ \ + --enable-shared \ + --disable-static \ + --disable-debug \ + --disable-programs \ + --disable-network \ + --disable-avdevice \ + --disable-avfilter \ + --disable-swscale \ + --disable-network \ + --disable-muxers \ + --disable-demuxers \ + --enable-rdft \ + --enable-demuxer=aac \ + --enable-demuxer=ac3 \ + --enable-demuxer=aiff \ + --enable-demuxer=ape \ + --enable-demuxer=asf \ + --enable-demuxer=flac \ + --enable-demuxer=matroska \ + --enable-demuxer=mp3 \ + --enable-demuxer=mpc \ + --enable-demuxer=mov \ + --enable-demuxer=mpc8 \ + --enable-demuxer=ogg \ + --enable-demuxer=tta \ + --enable-demuxer=wav \ + --enable-demuxer=wv \ + --disable-bsfs \ + --disable-filters \ + --disable-parsers \ + --enable-parser=aac \ + --enable-parser=ac3 \ + --enable-parser=mpegaudio \ + --disable-protocols \ + --disable-indevs \ + --disable-outdevs \ + --disable-encoders \ + --disable-decoders \ + --enable-decoder=eightsvx_exp \ + --enable-decoder=eightsvx_fib \ + --enable-decoder=aac \ + --enable-decoder=aac_latm \ + --enable-decoder=ac3 \ + --enable-decoder=adpcm_4xm \ + --enable-decoder=adpcm_adx \ + --enable-decoder=adpcm_afc \ + --enable-decoder=adpcm_ct \ + --enable-decoder=adpcm_ea \ + --enable-decoder=adpcm_ea_maxis_xa \ + --enable-decoder=adpcm_ea_r1 \ + --enable-decoder=adpcm_ea_r2 \ + --enable-decoder=adpcm_ea_r3 \ + --enable-decoder=adpcm_ea_xas \ + --enable-decoder=adpcm_g722 \ + --enable-decoder=adpcm_g726 \ + --enable-decoder=adpcm_ima_amv \ + --enable-decoder=adpcm_ima_apc \ + --enable-decoder=adpcm_ima_dk3 \ + --enable-decoder=adpcm_ima_dk4 \ + --enable-decoder=adpcm_ima_ea_eacs \ + --enable-decoder=adpcm_ima_ea_sead \ + --enable-decoder=adpcm_ima_iss \ + --enable-decoder=adpcm_ima_oki \ + --enable-decoder=adpcm_ima_qt \ + --enable-decoder=adpcm_ima_smjpeg \ + --enable-decoder=adpcm_ima_wav \ + --enable-decoder=adpcm_ima_ws \ + --enable-decoder=adpcm_ms \ + --enable-decoder=adpcm_sbpro_2 \ + --enable-decoder=adpcm_sbpro_3 \ + --enable-decoder=adpcm_sbpro_4 \ + --enable-decoder=adpcm_swf \ + --enable-decoder=adpcm_thp \ + --enable-decoder=adpcm_xa \ + --enable-decoder=adpcm_yamaha \ + --enable-decoder=alac \ + --enable-decoder=amrnb \ + --enable-decoder=libopencore_amrnb \ + --enable-decoder=amrwb \ + --enable-decoder=libopencore_amrwb \ + --enable-decoder=ape \ + --enable-decoder=atrac1 \ + --enable-decoder=atrac3 \ + --enable-decoder=binkaudio_dct \ + --enable-decoder=binkaudio_rdft \ + --enable-decoder=bmv_audio \ + --enable-decoder=comfortnoise \ + --enable-decoder=cook \ + --enable-decoder=dsicinaudio \ + --enable-decoder=dca \ + --enable-decoder=eac3 \ + --enable-decoder=flac \ + --enable-decoder=g723_1 \ + --enable-decoder=g729 \ + --enable-decoder=gsm \ + --enable-decoder=libgsm \ + --enable-decoder=gsm_ms \ + --enable-decoder=libgsm_ms \ + --enable-decoder=iac \ + --enable-decoder=imc \ + --enable-decoder=interplay_dpcm \ + --enable-decoder=mace3 \ + --enable-decoder=mace6 \ + --enable-decoder=mlp \ + --enable-decoder=mp1 \ + --enable-decoder=mp1float \ + --enable-decoder=mp2 \ + --enable-decoder=mp2float \ + --enable-decoder=mp3 \ + --enable-decoder=mp3float \ + --enable-decoder=mp3adu \ + --enable-decoder=mp3adufloat \ + --enable-decoder=mp3on4 \ + --enable-decoder=mp3on4float \ + --enable-decoder=als \ + --enable-decoder=mpc7 \ + --enable-decoder=mpc8 \ + --enable-decoder=nellymoser \ + --enable-decoder=libopus \ + --enable-decoder=paf_audio \ + --enable-decoder=pcm_alaw \ + --enable-decoder=pcm_bluray \ + --enable-decoder=pcm_dvd \ + --enable-decoder=pcm_f32be \ + --enable-decoder=pcm_f32le \ + --enable-decoder=pcm_f64be \ + --enable-decoder=pcm_f64le \ + --enable-decoder=pcm_lxf \ + --enable-decoder=pcm_mulaw \ + --enable-decoder=pcm_s16be \ + --enable-decoder=pcm_s16be_planar \ + --enable-decoder=pcm_s16le \ + --enable-decoder=pcm_s16le_planar \ + --enable-decoder=pcm_s24be \ + --enable-decoder=pcm_s24daud \ + --enable-decoder=pcm_s24le \ + --enable-decoder=pcm_s24le_planar \ + --enable-decoder=pcm_s32be \ + --enable-decoder=pcm_s32le \ + --enable-decoder=pcm_s32le_planar \ + --enable-decoder=pcm_s8 \ + --enable-decoder=pcm_s8_planar \ + --enable-decoder=pcm_u16be \ + --enable-decoder=pcm_u16le \ + --enable-decoder=pcm_u24be \ + --enable-decoder=pcm_u24le \ + --enable-decoder=pcm_u32be \ + --enable-decoder=pcm_u32le \ + --enable-decoder=pcm_u8 \ + --enable-decoder=pcm_zork \ + --enable-decoder=qcelp \ + --enable-decoder=qdm2 \ + --enable-decoder=ra_144 \ + --enable-decoder=ra_288 \ + --enable-decoder=ralf \ + --enable-decoder=roq_dpcm \ + --enable-decoder=s302m \ + --enable-decoder=shorten \ + --enable-decoder=sipr \ + --enable-decoder=smackaud \ + --enable-decoder=sol_dpcm \ + --enable-decoder=sonic \ + --enable-decoder=libspeex \ + --enable-decoder=tak \ + --enable-decoder=truehd \ + --enable-decoder=truespeech \ + --enable-decoder=tta \ + --enable-decoder=twinvq \ + --enable-decoder=vima \ + --enable-decoder=vmdaudio \ + --enable-decoder=vorbis \ + --enable-decoder=ffwavesynth \ + --enable-decoder=wavpack \ + --enable-decoder=ws_snd1 \ + --enable-decoder=wmalossless \ + --enable-decoder=wmapro \ + --enable-decoder=wmav1 \ + --enable-decoder=wmav2 \ + --enable-decoder=wmavoice \ + --enable-decoder=xan_dpcm \ + --enable-libspeex + make + sudo make install + + ls -al ../build + # otool -L build/*.dylib + + # - uses: actions/upload-artifact@v2 + # with: + # name: build + # path: build/* \ No newline at end of file From c4c6ff8376baef1fb3e1af472ab1b54f5761d36f Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Sat, 12 Nov 2022 17:03:20 +0800 Subject: [PATCH 06/13] ffmpeg depends on multimedia --- goldendict.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/goldendict.pro b/goldendict.pro index 2a64e09f..b09ce7ab 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -46,13 +46,14 @@ greaterThan(QT_MAJOR_VERSION, 5): QT += webenginecore core5compat DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050F00 -# QMediaPlayer is not available in Qt4. !CONFIG( no_qtmultimedia_player ) { QT += multimedia DEFINES += MAKE_QTMULTIMEDIA_PLAYER } !CONFIG( no_ffmpeg_player ) { + # ffmpeg depended on multimedia now. + QT += multimedia DEFINES += MAKE_FFMPEG_PLAYER } From 42fd3a749de2c4d8348157aeb27a34492156b350 Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Sat, 12 Nov 2022 17:26:10 +0800 Subject: [PATCH 07/13] add file reference link --- audiooutput.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/audiooutput.cpp b/audiooutput.cpp index 0ebe939d..292a14ec 100644 --- a/audiooutput.cpp +++ b/audiooutput.cpp @@ -15,6 +15,9 @@ #include #include +// take reference from this file (https://github.com/valbok/QtAVPlayer/blob/6cc30e484b354d59511c9a60fabced4cb7c57c8e/src/QtAVPlayer/qavaudiooutput.cpp) +// and make some changes. + static QAudioFormat format( int sampleRate, int channelCount ) { QAudioFormat out; From f37e2862ce9d17d5f0f395156590d6326417e708 Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Sat, 12 Nov 2022 17:27:16 +0800 Subject: [PATCH 08/13] remove commented line --- ffmpegaudio.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc index 78f2efd6..8e410fad 100644 --- a/ffmpegaudio.cc +++ b/ffmpegaudio.cc @@ -239,12 +239,6 @@ bool DecoderContext::openCodec( QString & errorString ) gdDebug( "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name, codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) ); -// if ( codecContext_->sample_fmt == AV_SAMPLE_FMT_S32 || -// codecContext_->sample_fmt == AV_SAMPLE_FMT_S32P || -// codecContext_->sample_fmt == AV_SAMPLE_FMT_FLT || -// codecContext_->sample_fmt == AV_SAMPLE_FMT_FLTP || -// codecContext_->sample_fmt == AV_SAMPLE_FMT_DBL || -// codecContext_->sample_fmt == AV_SAMPLE_FMT_DBLP ) { swr_ = swr_alloc_set_opts( NULL, av_get_default_channel_layout(2), From f708c5068c9ce7db0c51d33ee44963d006ceedee Mon Sep 17 00:00:00 2001 From: Igor Kushnir Date: Fri, 11 Nov 2022 21:07:17 +0200 Subject: [PATCH 09/13] Qt5: give focus to article view after last tab is closed When the last tab is closed while the article view in it has focus, Results Navigation Pane acquires focus in the Qt 4 version. This is OK, because typed text is sent to the translate line and all shortcuts work. In the Qt 5 version, depending on the value of the "Hide single tab" option, either no widget has focus or the tab bar acquires focus in this situation. This leads to issues described in the added comment. --- mainwindow.cc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/mainwindow.cc b/mainwindow.cc index a11c83c2..77e1be38 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -1757,9 +1757,23 @@ void MainWindow::tabCloseRequested( int x ) ui.tabWidget->removeTab( x ); delete w; + if( ui.tabWidget->count() != 0 ) + return; // if everything is closed, add a new tab - if ( ui.tabWidget->count() == 0 ) - addNewTab(); + addNewTab(); + +#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) + QWidget const * const focused = focusWidget(); + if( !focused || focused == ui.tabWidget->tabBar() ) + { + // The article view in the last closed tab had focus. Now no widget has focus or the tab bar acquired useless to it + // focus. In this situation GoldenDict ignores typing a new phrase to be translated. Furthermore, when no widget has + // focus, focus-transferring shortcuts don't work. Give focus to the newly created article view to work this around. + // Cannot just call focusArticleView() or focusTranslateLine(), because no window should be activated here. + Q_ASSERT( getCurrentArticleView() ); + getCurrentArticleView()->focus(); + } +#endif } void MainWindow::closeCurrentTab() From 5e8cab6d545b778cd797d713d6797ce1bfcfe629 Mon Sep 17 00:00:00 2001 From: Igor Kushnir Date: Mon, 14 Nov 2022 14:35:42 +0200 Subject: [PATCH 10/13] Show translateBoxWidget automatically when Words Zoom level decreases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When Search Pane is hidden, Words Zoom level is large and GoldenDict main window's width is small, translateBoxWidget does not fit into the toolbar and is hidden behind the toolbar extension button » on the right side. Reducing Words Zoom level does not automatically make translateBoxWidget visible until the user presses the toolbar extension button or types text to be translated. I haven't noticed any effect of the existing line of code that activates groupList parent widget's layout whether Search Pane is visible or hidden. This line was introduced in the commit that implemented TranslateBox - da139985183e7664b690c3c5482dcfaba7eeff22. In this initial implementation navToolbar was the parent of groupList, and translateBoxWidget did not yet exist. I think that the introduction of translateBoxWidget in 404a16442b45ff5129fe9e66b5672a21427bdc2f obsoleted this line of code, and so remove it here. I have verified that this fix works as intended in the Qt 4 and the Qt 5 version both under KDE Plasma and Xfce. --- mainwindow.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mainwindow.cc b/mainwindow.cc index 77e1be38..a4b64882 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -3948,8 +3948,13 @@ void MainWindow::applyWordsZoomLevel() } wordsZoomBase->setEnabled( cfg.preferences.wordsZoomLevel != 0 ); - // groupList->setFixedHeight(translateLine->height()); - groupList->parentWidget()->layout()->activate(); + + if( !cfg.preferences.searchInDock ) + { + // Invalidating navToolbar's layout displays translateBoxWidget w/o the need to press the toolbar + // extension button when Words Zoom level decreases enough for translateBoxWidget to fit in the toolbar. + navToolbar->layout()->invalidate(); + } if ( scanPopup.get() ) scanPopup->applyWordsZoomLevel(); From edea3948926c1d022b63c4ceccb000458ddf42fc Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Sat, 12 Nov 2022 13:51:31 +0800 Subject: [PATCH 11/13] [macos] add speex support --- .github/workflows/macos-homebrew.yml | 201 ++++++++++++++++++++++++++- 1 file changed, 195 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml index 8a646f29..20e11e9b 100644 --- a/.github/workflows/macos-homebrew.yml +++ b/.github/workflows/macos-homebrew.yml @@ -65,9 +65,200 @@ jobs: brew install autoconf brew install libtool brew install opencc + brew install speex + brew install wavpack + brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm + brew install speex + git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg + cd ffmpeg + ./configure --prefix=/usr/local \ + --enable-shared \ + --disable-static \ + --disable-debug \ + --disable-programs \ + --disable-network \ + --disable-avdevice \ + --disable-avfilter \ + --disable-swscale \ + --disable-network \ + --disable-muxers \ + --disable-demuxers \ + --enable-rdft \ + --enable-demuxer=aac \ + --enable-demuxer=ac3 \ + --enable-demuxer=aiff \ + --enable-demuxer=ape \ + --enable-demuxer=asf \ + --enable-demuxer=flac \ + --enable-demuxer=matroska \ + --enable-demuxer=mp3 \ + --enable-demuxer=mpc \ + --enable-demuxer=mov \ + --enable-demuxer=mpc8 \ + --enable-demuxer=ogg \ + --enable-demuxer=tta \ + --enable-demuxer=wav \ + --enable-demuxer=wv \ + --disable-bsfs \ + --disable-filters \ + --disable-parsers \ + --enable-parser=aac \ + --enable-parser=ac3 \ + --enable-parser=mpegaudio \ + --disable-protocols \ + --disable-indevs \ + --disable-outdevs \ + --disable-encoders \ + --disable-decoders \ + --enable-decoder=eightsvx_exp \ + --enable-decoder=eightsvx_fib \ + --enable-decoder=aac \ + --enable-decoder=aac_latm \ + --enable-decoder=ac3 \ + --enable-decoder=adpcm_4xm \ + --enable-decoder=adpcm_adx \ + --enable-decoder=adpcm_afc \ + --enable-decoder=adpcm_ct \ + --enable-decoder=adpcm_ea \ + --enable-decoder=adpcm_ea_maxis_xa \ + --enable-decoder=adpcm_ea_r1 \ + --enable-decoder=adpcm_ea_r2 \ + --enable-decoder=adpcm_ea_r3 \ + --enable-decoder=adpcm_ea_xas \ + --enable-decoder=adpcm_g722 \ + --enable-decoder=adpcm_g726 \ + --enable-decoder=adpcm_ima_amv \ + --enable-decoder=adpcm_ima_apc \ + --enable-decoder=adpcm_ima_dk3 \ + --enable-decoder=adpcm_ima_dk4 \ + --enable-decoder=adpcm_ima_ea_eacs \ + --enable-decoder=adpcm_ima_ea_sead \ + --enable-decoder=adpcm_ima_iss \ + --enable-decoder=adpcm_ima_oki \ + --enable-decoder=adpcm_ima_qt \ + --enable-decoder=adpcm_ima_smjpeg \ + --enable-decoder=adpcm_ima_wav \ + --enable-decoder=adpcm_ima_ws \ + --enable-decoder=adpcm_ms \ + --enable-decoder=adpcm_sbpro_2 \ + --enable-decoder=adpcm_sbpro_3 \ + --enable-decoder=adpcm_sbpro_4 \ + --enable-decoder=adpcm_swf \ + --enable-decoder=adpcm_thp \ + --enable-decoder=adpcm_xa \ + --enable-decoder=adpcm_yamaha \ + --enable-decoder=alac \ + --enable-decoder=amrnb \ + --enable-decoder=libopencore_amrnb \ + --enable-decoder=amrwb \ + --enable-decoder=libopencore_amrwb \ + --enable-decoder=ape \ + --enable-decoder=atrac1 \ + --enable-decoder=atrac3 \ + --enable-decoder=binkaudio_dct \ + --enable-decoder=binkaudio_rdft \ + --enable-decoder=bmv_audio \ + --enable-decoder=comfortnoise \ + --enable-decoder=cook \ + --enable-decoder=dsicinaudio \ + --enable-decoder=dca \ + --enable-decoder=eac3 \ + --enable-decoder=flac \ + --enable-decoder=g723_1 \ + --enable-decoder=g729 \ + --enable-decoder=gsm \ + --enable-decoder=libgsm \ + --enable-decoder=gsm_ms \ + --enable-decoder=libgsm_ms \ + --enable-decoder=iac \ + --enable-decoder=imc \ + --enable-decoder=interplay_dpcm \ + --enable-decoder=mace3 \ + --enable-decoder=mace6 \ + --enable-decoder=mlp \ + --enable-decoder=mp1 \ + --enable-decoder=mp1float \ + --enable-decoder=mp2 \ + --enable-decoder=mp2float \ + --enable-decoder=mp3 \ + --enable-decoder=mp3float \ + --enable-decoder=mp3adu \ + --enable-decoder=mp3adufloat \ + --enable-decoder=mp3on4 \ + --enable-decoder=mp3on4float \ + --enable-decoder=als \ + --enable-decoder=mpc7 \ + --enable-decoder=mpc8 \ + --enable-decoder=mp3*,pcm* \ + --enable-decoder=nellymoser \ + --enable-decoder=libopus \ + --enable-decoder=paf_audio \ + --enable-decoder=pcm_alaw \ + --enable-decoder=pcm_bluray \ + --enable-decoder=pcm_dvd \ + --enable-decoder=pcm_f32be \ + --enable-decoder=pcm_f32le \ + --enable-decoder=pcm_f64be \ + --enable-decoder=pcm_f64le \ + --enable-decoder=pcm_lxf \ + --enable-decoder=pcm_mulaw \ + --enable-decoder=pcm_s16be \ + --enable-decoder=pcm_s16be_planar \ + --enable-decoder=pcm_s16le \ + --enable-decoder=pcm_s16le_planar \ + --enable-decoder=pcm_s24be \ + --enable-decoder=pcm_s24daud \ + --enable-decoder=pcm_s24le \ + --enable-decoder=pcm_s24le_planar \ + --enable-decoder=pcm_s32be \ + --enable-decoder=pcm_s32le \ + --enable-decoder=pcm_s32le_planar \ + --enable-decoder=pcm_s8 \ + --enable-decoder=pcm_s8_planar \ + --enable-decoder=pcm_u16be \ + --enable-decoder=pcm_u16le \ + --enable-decoder=pcm_u24be \ + --enable-decoder=pcm_u24le \ + --enable-decoder=pcm_u32be \ + --enable-decoder=pcm_u32le \ + --enable-decoder=pcm_u8 \ + --enable-decoder=pcm_zork \ + --enable-decoder=qcelp \ + --enable-decoder=qdm2 \ + --enable-decoder=ra_144 \ + --enable-decoder=ra_288 \ + --enable-decoder=ralf \ + --enable-decoder=roq_dpcm \ + --enable-decoder=s302m \ + --enable-decoder=shorten \ + --enable-decoder=sipr \ + --enable-decoder=smackaud \ + --enable-decoder=sol_dpcm \ + --enable-decoder=sonic \ + --enable-decoder=libspeex \ + --enable-decoder=tak \ + --enable-decoder=truehd \ + --enable-decoder=truespeech \ + --enable-decoder=tta \ + --enable-decoder=twinvq \ + --enable-decoder=vima \ + --enable-decoder=vmdaudio \ + --enable-decoder=vorbis \ + --enable-decoder=ffwavesynth \ + --enable-decoder=wavpack \ + --enable-decoder=ws_snd1 \ + --enable-decoder=wmalossless \ + --enable-decoder=wmapro \ + --enable-decoder=wmav1 \ + --enable-decoder=wmav2 \ + --enable-decoder=wmavoice \ + --enable-decoder=xan_dpcm \ + --enable-libmp3lame \ + --enable-libspeex - brew tap homebrew-ffmpeg/ffmpeg - brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex + make + sudo make install + cd .. brew install libiconv brew install lzo bzip2 brew install libogg @@ -75,10 +266,8 @@ jobs: brew install libtiff brew install libvorbis brew install hunspell - wget ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.3.tar.bz2 - tar xvjf eb-4.4.3.tar.bz2 - cd eb-4.4.3 && ./configure && make -j 8 && sudo make install && cd .. - #brew install qt # or use official offline installer + git clone https://github.com/xiaoyifang/eb.git + cd eb && ./configure && make -j 8 && sudo make install && cd .. brew install xz lzo brew install pkg-config brew install create-dmg From 12acff095c9414c9a260e563ed942e2605eb07fc Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Tue, 15 Nov 2022 19:54:34 +0800 Subject: [PATCH 12/13] ffmpeg convert the the audio to raw format --- audiooutput.cpp | 2 +- ffmpegaudio.cc | 77 ++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/audiooutput.cpp b/audiooutput.cpp index 292a14ec..feecf78e 100644 --- a/audiooutput.cpp +++ b/audiooutput.cpp @@ -23,7 +23,7 @@ static QAudioFormat format( int sampleRate, int channelCount ) QAudioFormat out; out.setSampleRate( sampleRate ); - out.setChannelCount( 2 ); + out.setChannelCount( channelCount ); #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) out.setByteOrder( QAudioFormat::LittleEndian ); out.setCodec( QLatin1String( "audio/pcm" ) ); diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc index 8e410fad..a3875d31 100644 --- a/ffmpegaudio.cc +++ b/ffmpegaudio.cc @@ -241,7 +241,7 @@ bool DecoderContext::openCodec( QString & errorString ) { swr_ = swr_alloc_set_opts( NULL, - av_get_default_channel_layout(2), + codecContext_->channel_layout, AV_SAMPLE_FMT_S16, codecContext_->sample_rate, codecContext_->channel_layout, @@ -383,14 +383,75 @@ bool DecoderContext::play( QString & errorString ) bool DecoderContext::normalizeAudio( AVFrame * frame, vector & samples ) { int lineSize = 0; -// int dataSize = av_samples_get_buffer_size( &lineSize, codecContext_->channels, -// frame->nb_samples, codecContext_->sample_fmt, 1 ); - int dataSize = frame->nb_samples * 2 * 2; - samples.resize( dataSize ); - uint8_t *data[2] = { 0 }; - data[0] = &samples.front(); //输出格式为AV_SAMPLE_FMT_S16(packet类型),所以转换后的LR两通道都存在data[0]中 + int dataSize = av_samples_get_buffer_size( &lineSize, codecContext_->channels, + frame->nb_samples, codecContext_->sample_fmt, 1 ); + // Portions from: https://code.google.com/p/lavfilters/source/browse/decoder/LAVAudio/LAVAudio.cpp + // But this one use 8, 16, 32 bits integer, respectively. + switch ( codecContext_->sample_fmt ) + { + case AV_SAMPLE_FMT_U8: + case AV_SAMPLE_FMT_S16: + { + samples.resize( dataSize ); + memcpy( &samples.front(), frame->data[0], lineSize ); + } + break; + // Planar + case AV_SAMPLE_FMT_U8P: + { + samples.resize( dataSize ); - swr_convert( swr_, data, frame->nb_samples, (const uint8_t**)frame->data, frame->nb_samples ); + uint8_t * out = ( uint8_t * )&samples.front(); + for ( int i = 0; i < frame->nb_samples; i++ ) + { + for ( int ch = 0; ch < codecContext_->channels; ch++ ) + { + *out++ = ( ( uint8_t * )frame->extended_data[ch] )[i]; + } + } + } + break; + case AV_SAMPLE_FMT_S16P: + { + samples.resize( dataSize ); + + int16_t * out = ( int16_t * )&samples.front(); + for ( int i = 0; i < frame->nb_samples; i++ ) + { + for ( int ch = 0; ch < codecContext_->channels; ch++ ) + { + *out++ = ( ( int16_t * )frame->extended_data[ch] )[i]; + } + } + } + break; + case AV_SAMPLE_FMT_S32: + /* Pass through */ + case AV_SAMPLE_FMT_S32P: + /* Pass through */ + case AV_SAMPLE_FMT_FLT: + /* Pass through */ + case AV_SAMPLE_FMT_FLTP: + /* Pass through */ + { + samples.resize( dataSize / 2 ); + + uint8_t *out = ( uint8_t * )&samples.front(); + swr_convert( swr_, &out, frame->nb_samples, (const uint8_t**)frame->extended_data, frame->nb_samples ); + } + break; + case AV_SAMPLE_FMT_DBL: + case AV_SAMPLE_FMT_DBLP: + { + samples.resize( dataSize / 4 ); + + uint8_t *out = ( uint8_t * )&samples.front(); + swr_convert( swr_, &out, frame->nb_samples, (const uint8_t**)frame->extended_data, frame->nb_samples ); + } + break; + default: + return false; + } return true; } From 66ec6b6d63926d389c0c618729624523597892de Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Wed, 16 Nov 2022 21:09:30 +0800 Subject: [PATCH 13/13] fix: mdx headword total count is incorrect --- articleview.cc | 4 ++-- mdx.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/articleview.cc b/articleview.cc index 9263e01e..d11ef120 100644 --- a/articleview.cc +++ b/articleview.cc @@ -2029,8 +2029,8 @@ void ArticleView::contextMenuRequested( QPoint const & pos ) if ( result == saveSoundAction ) { // Audio data - if ( name.indexOf( '.' ) < 0 ) - name += ".wav"; +// if ( name.indexOf( '.' ) < 0 ) +// name += ".wav"; fileName = savePath + "/" + name; fileName = QFileDialog::getSaveFileName( parentWidget(), tr( "Save sound" ), diff --git a/mdx.cc b/mdx.cc index 25dd4fc3..8d821904 100644 --- a/mdx.cc +++ b/mdx.cc @@ -1603,8 +1603,8 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f idxHeader.formatVersion = kCurrentFormatVersion; idxHeader.parserVersion = MdictParser::kParserVersion; idxHeader.foldingVersion = Folding::Version; - idxHeader.articleCount = parser.wordCount(); - idxHeader.wordCount = parser.wordCount(); + idxHeader.articleCount = indexedWords.size(); + idxHeader.wordCount = indexedWords.size(); idx.rewind(); idx.write( &idxHeader, sizeof( idxHeader ) );