correct spell of prepare

zhy282289 · Jun 23, 2013 · cd657d7 · cd657d7
1 parent 7ae37f0
commit cd657d7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/QtAV/VideoDecoder.h b/src/QtAV/VideoDecoder.h
@@ -33,6 +33,7 @@ class Q_EXPORT VideoDecoder : public AVDecoder
     DPTR_DECLARE_PRIVATE(VideoDecoder)
 public:
     VideoDecoder();
+    //virtual bool prepare();
     virtual bool decode(const QByteArray &encoded);
     //TODO: new api: originalVideoSize()(inSize()), decodedVideoSize()(outSize())
     //size: the decoded(actually then resized in ImageConverter) frame size

diff --git a/src/QtAV/private/XVRenderer_p.h b/src/QtAV/private/XVRenderer_p.h
@@ -119,7 +119,7 @@ class XVRendererPrivate : public VideoRendererPrivate
         XFree(xv_image_formats);
         return false;
     }
-    bool prepairDeviceResource() {
+    bool prepareDeviceResource() {
         gc = XCreateGC(display, q_func().winId(), 0, 0);
         if (!gc) {
             available = false;
@@ -130,7 +130,7 @@ class XVRendererPrivate : public VideoRendererPrivate
         return true;
     }
 
-    bool prepairImage(int w, int h) {
+    bool prepareImage(int w, int h) {
         //TODO: check shm
         if (xv_image_width == w && xv_image_height == h && xv_image)
             return true;

diff --git a/src/XVRenderer.cpp b/src/XVRenderer.cpp
@@ -55,7 +55,7 @@ QPaintEngine* XVRenderer::paintEngine() const
 void XVRenderer::convertData(const QByteArray &data)
 {
     DPTR_D(XVRenderer);
-    if (!d.prepairImage(d.src_width, d.src_height))
+    if (!d.prepareImage(d.src_width, d.src_height))
         return;
     //TODO: if date is deep copied, mutex can be avoided
     QMutexLocker locker(&d.img_mutex);
@@ -144,7 +144,7 @@ void XVRenderer::showEvent(QShowEvent *event)
      * When Qt::WindowStaysOnTopHint changed, window will hide first then show. If you
      * don't do anything here, the widget content will never be updated.
      */
-    d.prepairDeviceResource();
+    d.prepareDeviceResource();
 }
 
 bool XVRenderer::write()