fix a typo: stero => stereo

tangfreeze · Oct 3, 2015 · 0bd0553 · 0bd0553
1 parent 992d3de
commit 0bd0553
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 27 deletions.
diff --git a/Changelog b/Changelog
@@ -233,7 +233,7 @@ version 1.2.4    2013-09-08
 
 - QML support(thanks theoribeiro <[email protected]>). Can replace some of qtmultimedia qml apps, e.g. qmlvideofx
 - Fix build for FFmpeg >= 0.9, libav >= 0.8
-- Channel can be choosed by user: original, stero, left, right, centre(mono)
+- Channel can be choosed by user: original, stereo, left, right, centre(mono)
 - OSD for GL ES2 renderer
 - player: statistics viewer, disable screensaver on widows when playing, more online tv channels
 

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ QtAV can meet your most demands
 - Real time preview
 - Video capture in rgb and yuv format
 - OSD and custom filters
-- Filters in libavfilter, for example stero3d, blur
+- Filters in libavfilter, for example stereo3d, blur
 - Subtitle supports ass, srt etc. Dynamic change FFmpeg and libass engine
 - Playing frame by frame (currently support forward playing)
 - Playback speed control

diff --git a/debian/control b/debian/control
@@ -34,7 +34,7 @@ Description: FFmpeg powered multimedia playback SDK for Qt
    * OpenGL and ES2 support for Hi10P and other 16-bit YUV videos
    * Video capture in rgb and yuv format
    * OSD and custom filters
-   * filters in libavfilter, for example stero3d, blur
+   * filters in libavfilter, for example stereo3d, blur
    * Subtitles
    * Playback speed control
    * Variant streams: locale file, http, rtsp, etc.

diff --git a/examples/QMLPlayer/i18n/QMLPlayer_zh_CN.qm b/examples/QMLPlayer/i18n/QMLPlayer_zh_CN.qm
diff --git a/examples/QMLPlayer/i18n/QMLPlayer_zh_CN.ts b/examples/QMLPlayer/i18n/QMLPlayer_zh_CN.ts
@@ -113,7 +113,7 @@
     </message>
     <message>
         <location filename="../qml/QMLPlayer/AudioPage.qml" line="99"/>
-        <source>Stero</source>
+        <source>Stereo</source>
         <translation>立体声</translation>
     </message>
     <message>

diff --git a/examples/QMLPlayer/qml/QMLPlayer/AudioPage.qml b/examples/QMLPlayer/qml/QMLPlayer/AudioPage.qml
@@ -96,7 +96,7 @@ Page {
         }
     }
     Component.onCompleted: {
-        channelModel.append({name: qsTr("Stero"), value: MediaPlayer.Stero })
+        channelModel.append({name: qsTr("Stereo"), value: MediaPlayer.Stereo })
         channelModel.append({name: qsTr("Mono"), value: MediaPlayer.Mono })
         channelModel.append({name: qsTr("Left"), value: MediaPlayer.Left })
         channelModel.append({name: qsTr("Right"), value: MediaPlayer.Right })

diff --git a/examples/player/MainWindow.cpp b/examples/player/MainWindow.cpp
@@ -445,7 +445,7 @@ void MainWindow::setupUi()
     mpChannelMenu = subMenu;
     connect(subMenu, SIGNAL(triggered(QAction*)), SLOT(changeChannel(QAction*)));
     subMenu->addAction(tr("As input"))->setData(AudioFormat::ChannelLayout_Unsupported); //will set to input in resampler if not supported.
-    subMenu->addAction(tr("Stero"))->setData(AudioFormat::ChannelLayout_Stero);
+    subMenu->addAction(tr("Stereo"))->setData(AudioFormat::ChannelLayout_Stereo);
     subMenu->addAction(tr("Mono (center)"))->setData(AudioFormat::ChannelLayout_Center);
     subMenu->addAction(tr("Left"))->setData(AudioFormat::ChannelLayout_Left);
     subMenu->addAction(tr("Right"))->setData(AudioFormat::ChannelLayout_Right);

diff --git a/examples/player/res/player_zh_CN.qm b/examples/player/res/player_zh_CN.qm
diff --git a/examples/player/res/player_zh_CN.ts b/examples/player/res/player_zh_CN.ts
@@ -599,7 +599,7 @@
     </message>
     <message>
         <location filename="../MainWindow.cpp" line="443"/>
-        <source>Stero</source>
+        <source>Stereo</source>
         <translation>立体声</translation>
     </message>
     <message>

diff --git a/qml/QmlAV/QmlAVPlayer.h b/qml/QmlAV/QmlAVPlayer.h
@@ -107,11 +107,11 @@ class QmlAVPlayer : public QObject, public QQmlParserStatus
     };
     // currently supported channels<3.
     enum ChannelLayout {
-        ChannelLayoutAuto, //the same as source if channels<=2. otherwise resamples to stero
+        ChannelLayoutAuto, //the same as source if channels<=2. otherwise resamples to stereo
         Left,
         Right,
         Mono,
-        Stero
+        Stereo
     };
 
     explicit QmlAVPlayer(QObject *parent = 0);

diff --git a/qml/QmlAVPlayer.cpp b/qml/QmlAVPlayer.cpp
@@ -288,7 +288,7 @@ static AudioFormat::ChannelLayout toAudioFormatChannelLayout(QmlAVPlayer::Channe
     { QmlAVPlayer::Left, AudioFormat::ChannelLayout_Left },
     { QmlAVPlayer::Right, AudioFormat::ChannelLayout_Right },
     { QmlAVPlayer::Mono, AudioFormat::ChannelLayout_Mono },
-    { QmlAVPlayer::Stero, AudioFormat::ChannelLayout_Stero },
+    { QmlAVPlayer::Stereo, AudioFormat::ChannelLayout_Stereo },
     };
     for (uint i = 0; i < sizeof(map)/sizeof(map[0]); ++i) {
         if (map[i].ch == ch)

diff --git a/qml/plugins.qmltypes b/qml/plugins.qmltypes
@@ -173,7 +173,7 @@ Module {
                 "Left": 1,
                 "Right": 2,
                 "Mono": 3,
-                "Stero": 4
+                "Stereo": 4
             }
         }
         Property { name: "volume"; type: "double" }

diff --git a/src/AudioFormat.cpp b/src/AudioFormat.cpp
@@ -80,7 +80,7 @@ static const ChannelLayoutMap kChannelLayoutMap[] = {
     { AV_CH_FRONT_RIGHT, AudioFormat::ChannelLayout_Right },
     { AV_CH_FRONT_CENTER, AudioFormat::ChannelLayout_Center },
     { AV_CH_LAYOUT_MONO, AudioFormat::ChannelLayout_Mono },
-    { AV_CH_LAYOUT_STEREO, AudioFormat::ChannelLayout_Stero },
+    { AV_CH_LAYOUT_STEREO, AudioFormat::ChannelLayout_Stereo },
     { 0, AudioFormat::ChannelLayout_Unsupported}
 };
 

diff --git a/src/AudioResamplerTemplate.cpp b/src/AudioResamplerTemplate.cpp
@@ -167,7 +167,7 @@ bool AudioResamplerFF::prepare()
     //d.in_planes = av_sample_fmt_is_planar((enum AVSampleFormat)d.in_sample_format) ? d.in_channels : 1;
     //d.out_planes = av_sample_fmt_is_planar((enum AVSampleFormat)d.out_sample_format) ? d.out_channels : 1;
     if (d.context)
-        swr_free(&d.context); //TODO: if no free(of cause free is required), why channel mapping and layout not work if change from left to stero?
+        swr_free(&d.context); //TODO: if no free(of cause free is required), why channel mapping and layout not work if change from left to stereo?
     //If use swr_alloc() need to set the parameters (av_opt_set_xxx() manually or with swr_alloc_set_opts()) before calling swr_init()
     d.context = swr_alloc_set_opts(d.context
                                    , d.out_format.channelLayoutFFmpeg()

diff --git a/src/QtAV/AudioFormat.h b/src/QtAV/AudioFormat.h
@@ -64,7 +64,7 @@ class Q_AV_EXPORT AudioFormat
         ChannelLayout_Right,
         ChannelLayout_Center,
         ChannelLayout_Mono = ChannelLayout_Center,
-        ChannelLayout_Stero,
+        ChannelLayout_Stereo,
         ChannelLayout_Unsupported //ok. now it's not complete
     };
     //typedef qint64 ChannelLayout; //currently use latest FFmpeg's

diff --git a/src/QtAV/AudioOutput.h b/src/QtAV/AudioOutput.h
@@ -152,7 +152,7 @@ class Q_AV_EXPORT AudioOutput : public QObject, public AVOutput
     AudioFormat::SampleFormat preferredSampleFormat() const;
     /*!
      * \brief preferredChannelLayout
-     * \return the preferred channel layout. default is stero
+     * \return the preferred channel layout. default is stereo
      */
     AudioFormat::ChannelLayout preferredChannelLayout() const;
     /*!

diff --git a/src/QtAV/private/AudioOutputBackend.h b/src/QtAV/private/AudioOutputBackend.h
@@ -60,9 +60,9 @@ class Q_AV_PRIVATE_EXPORT AudioOutputBackend : public QObject
     virtual AudioFormat::SampleFormat preferredSampleFormat() const { return AudioFormat::SampleFormat_Signed16;}
     /*!
      * \brief preferredChannelLayout
-     * \return the preferred channel layout. default is stero
+     * \return the preferred channel layout. default is stereo
      */
-    virtual AudioFormat::ChannelLayout preferredChannelLayout() const { return AudioFormat::ChannelLayout_Stero;}
+    virtual AudioFormat::ChannelLayout preferredChannelLayout() const { return AudioFormat::ChannelLayout_Stereo;}
     /*!
      * \brief The BufferControl enum
      * Used to adapt to different audio playback backend. Usually you don't need this in application level development.

diff --git a/src/codec/audio/AudioEncoderFFmpeg.cpp b/src/codec/audio/AudioEncoderFFmpeg.cpp
@@ -116,8 +116,8 @@ bool AudioEncoderFFmpegPrivate::open()
             qDebug("use first supported channel layout: %lld", codec->channel_layouts[0]);
             format_used.setChannelLayoutFFmpeg((qint64)codec->channel_layouts[0]);
         } else {
-            qWarning("channel layout and supported channel layout are not set. use stero");
-            format_used.setChannelLayout(AudioFormat::ChannelLayout_Stero);
+            qWarning("channel layout and supported channel layout are not set. use stereo");
+            format_used.setChannelLayout(AudioFormat::ChannelLayout_Stereo);
         }
     }
     avctx->sample_fmt = (AVSampleFormat)format_used.sampleFormatFFmpeg();

diff --git a/src/output/audio/AudioOutput.cpp b/src/output/audio/AudioOutput.cpp
@@ -259,7 +259,7 @@ AudioOutput::AudioOutput(QObject* parent)
 {
     qDebug() << "Registered audio backends: " << AudioOutput::backendsAvailable(); // call this to register
     d_func().format.setSampleFormat(AudioFormat::SampleFormat_Signed16);
-    d_func().format.setChannelLayout(AudioFormat::ChannelLayout_Stero);
+    d_func().format.setChannelLayout(AudioFormat::ChannelLayout_Stereo);
     static const QStringList all = QStringList()
 #if QTAV_HAVE(XAUDIO2)
             << QStringLiteral("XAudio2")
@@ -558,7 +558,7 @@ AudioFormat::ChannelLayout AudioOutput::preferredChannelLayout() const
 {
     DPTR_D(const AudioOutput);
     if (!d.backend)
-        return AudioFormat::ChannelLayout_Stero;
+        return AudioFormat::ChannelLayout_Stereo;
     return d.backend->preferredChannelLayout();
 }
 

diff --git a/src/output/audio/AudioOutputOpenAL.cpp b/src/output/audio/AudioOutputOpenAL.cpp
@@ -344,13 +344,13 @@ bool AudioOutputOpenAL::isSupported(AudioFormat::SampleFormat sampleFormat) cons
         return alIsExtensionPresent("AL_EXT_float32");
     if (sampleFormat == AudioFormat::SampleFormat_Double)
         return alIsExtensionPresent("AL_EXT_double");
-    // because preferredChannelLayout() is stero while s32 only supports >3 channels, so always false
+    // because preferredChannelLayout() is stereo while s32 only supports >3 channels, so always false
     return false;
 }
 
 bool AudioOutputOpenAL::isSupported(AudioFormat::ChannelLayout channelLayout) const
 {
-    return channelLayout == AudioFormat::ChannelLayout_Mono || channelLayout == AudioFormat::ChannelLayout_Stero;
+    return channelLayout == AudioFormat::ChannelLayout_Mono || channelLayout == AudioFormat::ChannelLayout_Stereo;
 }
 
 AudioFormat::SampleFormat AudioOutputOpenAL::preferredSampleFormat() const
@@ -360,7 +360,7 @@ AudioFormat::SampleFormat AudioOutputOpenAL::preferredSampleFormat() const
 
 AudioFormat::ChannelLayout AudioOutputOpenAL::preferredChannelLayout() const
 {
-    return AudioFormat::ChannelLayout_Stero;
+    return AudioFormat::ChannelLayout_Stereo;
 }
 
 QString AudioOutputOpenAL::deviceName() const

diff --git a/src/output/audio/AudioOutputOpenSL.cpp b/src/output/audio/AudioOutputOpenSL.cpp
@@ -194,7 +194,7 @@ bool AudioOutputOpenSL::isSupported(AudioFormat::SampleFormat sampleFormat) cons
 
 bool AudioOutputOpenSL::isSupported(AudioFormat::ChannelLayout channelLayout) const
 {
-    return channelLayout == AudioFormat::ChannelLayout_Mono || channelLayout == AudioFormat::ChannelLayout_Stero;
+    return channelLayout == AudioFormat::ChannelLayout_Mono || channelLayout == AudioFormat::ChannelLayout_Stereo;
 }
 
 AudioFormat::SampleFormat AudioOutputOpenSL::preferredSampleFormat() const
@@ -204,7 +204,7 @@ AudioFormat::SampleFormat AudioOutputOpenSL::preferredSampleFormat() const
 
 AudioFormat::ChannelLayout AudioOutputOpenSL::preferredChannelLayout() const
 {
-    return AudioFormat::ChannelLayout_Stero;
+    return AudioFormat::ChannelLayout_Stereo;
 }
 
 AudioOutputBackend::BufferControl AudioOutputOpenSL::bufferControl() const

diff --git a/src/output/audio/AudioOutputXAudio2.cpp b/src/output/audio/AudioOutputXAudio2.cpp
@@ -253,7 +253,7 @@ bool AudioOutputXAudio2::isSupported(AudioFormat::SampleFormat sampleFormat) con
 // FIXME:
 bool AudioOutputXAudio2::isSupported(AudioFormat::ChannelLayout channelLayout) const
 {
-    return channelLayout == AudioFormat::ChannelLayout_Mono || channelLayout == AudioFormat::ChannelLayout_Stero;
+    return channelLayout == AudioFormat::ChannelLayout_Mono || channelLayout == AudioFormat::ChannelLayout_Stereo;
 }