diff options
| author | Darrell Anderson <[email protected]> | 2012-03-09 19:32:13 -0600 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-05 02:28:12 +0200 |
| commit | 2dd3661d783e3fa59a33e61779adab4d64182ebb (patch) | |
| tree | 583c7b9293d7ba845863534734c7a26a77cfae0b | |
| parent | ccf316153b364ae946ad071dec900fa9be547f16 (diff) | |
| download | kaffeine-2dd3661d783e3fa59a33e61779adab4d64182ebb.tar.gz kaffeine-2dd3661d783e3fa59a33e61779adab4d64182ebb.zip | |
Fix nominal "tqt" typos and fix slow DVB start.
This closes bug reports 729 and 899.
(cherry picked from commit fd68e4c4940afb4529b16e2c3e3d0f379ac7b161)
5 files changed, 10 insertions, 10 deletions
diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp index 96752aa..32c8817 100644 --- a/kaffeine/src/player-parts/gstreamer-part/video.cpp +++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp @@ -232,7 +232,7 @@ void VideoWindow::correctByAspectRatio( TQSize& frame ) case FOURBYTHREE: factor = 4.0 / 3.0; break; case ANAMORPHIC: factor = 16.0 / 9.0; break; case DVB: factor = 2.11; break; - case STQUARE: factor = 1.0; break; + case SQUARE: factor = 1.0; break; } float frameAspect = (float)frame.width() / (float)frame.height(); @@ -291,7 +291,7 @@ void VideoWindow::slotAspectRatioDVB() void VideoWindow::slotAspectRatioSquare() { - m_aspectRatio = STQUARE; + m_aspectRatio = SQUARE; TQSize frame = getFrameSize(); correctByAspectRatio( frame ); emit signalNewFrameSize( frame ); diff --git a/kaffeine/src/player-parts/gstreamer-part/video.h b/kaffeine/src/player-parts/gstreamer-part/video.h index 5782936..4e90748 100644 --- a/kaffeine/src/player-parts/gstreamer-part/video.h +++ b/kaffeine/src/player-parts/gstreamer-part/video.h @@ -47,7 +47,7 @@ public: FOURBYTHREE, ANAMORPHIC, DVB, - STQUARE + SQUARE }; void newState(); diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.h b/kaffeine/src/player-parts/xine-part/deinterlacequality.h index 536a998..d2b5068 100644 --- a/kaffeine/src/player-parts/xine-part/deinterlacequality.h +++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef DEINTERLACETQUALITY_H -#define DEINTERLACETQUALITY_H +#ifndef DEINTERLACEQUALITY_H +#define DEINTERLACEQUALITY_H #include <kdialogbase.h> @@ -77,4 +77,4 @@ private: KPushButton* m_customConfigButton; }; -#endif /* DEINTERLACETQUALITY_H */ +#endif /* DEINTERLACEQUALITY_H */ diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h index 50ee8e9..339b020 100644 --- a/kaffeine/src/player-parts/xine-part/equalizer.h +++ b/kaffeine/src/player-parts/xine-part/equalizer.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef ETQUALIZER_H -#define ETQUALIZER_H +#ifndef EQUALIZER_H +#define EQUALIZER_H #include <kdialogbase.h> #include <kconfig.h> @@ -77,4 +77,4 @@ private: TQSlider* eq16kSlider; }; -#endif /* ETQUALIZER_H */ +#endif /* EQUALIZER_H */ diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp index 1c738f7..f0cddb0 100644 --- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp @@ -3889,7 +3889,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide break; default: warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").arg(ratio)); - case XINE_VO_ASPECT_STQUARE: + case XINE_VO_ASPECT_SQUARE: debugOut("Screenshot: got video aspect: 1:1"); desired_ratio = image_ratio; break; |