Fix nominal "tqt" typos and fix slow DVB start.

This closes bug reports 729 and 899.
(cherry picked from commit fd68e4c494)
v3.5.13-sru
Darrell Anderson 13 years ago committed by Slávek Banko
parent ccf316153b
commit 2dd3661d78

@ -232,7 +232,7 @@ void VideoWindow::correctByAspectRatio( TQSize& frame )
case FOURBYTHREE: factor = 4.0 / 3.0; break; case FOURBYTHREE: factor = 4.0 / 3.0; break;
case ANAMORPHIC: factor = 16.0 / 9.0; break; case ANAMORPHIC: factor = 16.0 / 9.0; break;
case DVB: factor = 2.11; 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(); float frameAspect = (float)frame.width() / (float)frame.height();
@ -291,7 +291,7 @@ void VideoWindow::slotAspectRatioDVB()
void VideoWindow::slotAspectRatioSquare() void VideoWindow::slotAspectRatioSquare()
{ {
m_aspectRatio = STQUARE; m_aspectRatio = SQUARE;
TQSize frame = getFrameSize(); TQSize frame = getFrameSize();
correctByAspectRatio( frame ); correctByAspectRatio( frame );
emit signalNewFrameSize( frame ); emit signalNewFrameSize( frame );

@ -47,7 +47,7 @@ public:
FOURBYTHREE, FOURBYTHREE,
ANAMORPHIC, ANAMORPHIC,
DVB, DVB,
STQUARE SQUARE
}; };
void newState(); void newState();

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef DEINTERLACETQUALITY_H #ifndef DEINTERLACEQUALITY_H
#define DEINTERLACETQUALITY_H #define DEINTERLACEQUALITY_H
#include <kdialogbase.h> #include <kdialogbase.h>
@ -77,4 +77,4 @@ private:
KPushButton* m_customConfigButton; KPushButton* m_customConfigButton;
}; };
#endif /* DEINTERLACETQUALITY_H */ #endif /* DEINTERLACEQUALITY_H */

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef ETQUALIZER_H #ifndef EQUALIZER_H
#define ETQUALIZER_H #define EQUALIZER_H
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kconfig.h> #include <kconfig.h>
@ -77,4 +77,4 @@ private:
TQSlider* eq16kSlider; TQSlider* eq16kSlider;
}; };
#endif /* ETQUALIZER_H */ #endif /* EQUALIZER_H */

@ -3889,7 +3889,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
break; break;
default: default:
warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").arg(ratio)); 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"); debugOut("Screenshot: got video aspect: 1:1");
desired_ratio = image_ratio; desired_ratio = image_ratio;
break; break;

Loading…
Cancel
Save