equal
deleted
inserted
replaced
155 :QT7VideoWindowControl(parent), |
155 :QT7VideoWindowControl(parent), |
156 m_movie(0), |
156 m_movie(0), |
157 m_movieView(0), |
157 m_movieView(0), |
158 m_winId(0), |
158 m_winId(0), |
159 m_fullscreen(false), |
159 m_fullscreen(false), |
160 m_aspectRatioMode(QVideoWidget::KeepAspectRatio), |
160 m_aspectRatioMode(Qt::KeepAspectRatio), |
161 m_brightness(0), |
161 m_brightness(0), |
162 m_contrast(0), |
162 m_contrast(0), |
163 m_hue(0), |
163 m_hue(0), |
164 m_saturation(0) |
164 m_saturation(0) |
165 { |
165 { |
221 { |
221 { |
222 m_displayRect = rect; |
222 m_displayRect = rect; |
223 |
223 |
224 if (m_movieView) { |
224 if (m_movieView) { |
225 AutoReleasePool pool; |
225 AutoReleasePool pool; |
226 [(QTMovieView*)m_movieView setPreservesAspectRatio:(m_aspectRatioMode == QVideoWidget::KeepAspectRatio ? YES : NO)]; |
226 [(QTMovieView*)m_movieView setPreservesAspectRatio:(m_aspectRatioMode == Qt::KeepAspectRatio ? YES : NO)]; |
227 [(QTMovieView*)m_movieView setFrame:NSMakeRect(m_displayRect.x(), |
227 [(QTMovieView*)m_movieView setFrame:NSMakeRect(m_displayRect.x(), |
228 m_displayRect.y(), |
228 m_displayRect.y(), |
229 m_displayRect.width(), |
229 m_displayRect.width(), |
230 m_displayRect.height())]; |
230 m_displayRect.height())]; |
231 } |
231 } |
250 QSize QT7MovieViewOutput::nativeSize() const |
250 QSize QT7MovieViewOutput::nativeSize() const |
251 { |
251 { |
252 return m_nativeSize; |
252 return m_nativeSize; |
253 } |
253 } |
254 |
254 |
255 QVideoWidget::AspectRatioMode QT7MovieViewOutput::aspectRatioMode() const |
255 Qt::AspectRatioMode QT7MovieViewOutput::aspectRatioMode() const |
256 { |
256 { |
257 return m_aspectRatioMode; |
257 return m_aspectRatioMode; |
258 } |
258 } |
259 |
259 |
260 void QT7MovieViewOutput::setAspectRatioMode(QVideoWidget::AspectRatioMode mode) |
260 void QT7MovieViewOutput::setAspectRatioMode(Qt::AspectRatioMode mode) |
261 { |
261 { |
262 m_aspectRatioMode = mode; |
262 m_aspectRatioMode = mode; |
263 setDisplayRect(m_displayRect); |
263 setDisplayRect(m_displayRect); |
264 } |
264 } |
265 |
265 |