OLD | NEW |
---|---|
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "WebMediaPlayerClientImpl.h" | 6 #include "WebMediaPlayerClientImpl.h" |
7 | 7 |
8 #if ENABLE(VIDEO) | 8 #if ENABLE(VIDEO) |
9 | 9 |
10 #include "AudioBus.h" | 10 #include "AudioBus.h" |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
109 ASSERT(m_mediaPlayer); | 109 ASSERT(m_mediaPlayer); |
110 m_mediaPlayer->networkStateChanged(); | 110 m_mediaPlayer->networkStateChanged(); |
111 } | 111 } |
112 | 112 |
113 void WebMediaPlayerClientImpl::readyStateChanged() | 113 void WebMediaPlayerClientImpl::readyStateChanged() |
114 { | 114 { |
115 ASSERT(m_mediaPlayer); | 115 ASSERT(m_mediaPlayer); |
116 m_mediaPlayer->readyStateChanged(); | 116 m_mediaPlayer->readyStateChanged(); |
117 } | 117 } |
118 | 118 |
119 void WebMediaPlayerClientImpl::volumeChanged(float newVolume) | 119 void WebMediaPlayerClientImpl::volumeChanged(double newVolume) |
120 { | 120 { |
121 ASSERT(m_mediaPlayer); | 121 ASSERT(m_mediaPlayer); |
122 m_mediaPlayer->volumeChanged(newVolume); | 122 m_mediaPlayer->volumeChanged(newVolume); |
123 } | 123 } |
124 | 124 |
125 void WebMediaPlayerClientImpl::muteChanged(bool newMute) | 125 void WebMediaPlayerClientImpl::muteChanged(bool newMute) |
126 { | 126 { |
127 ASSERT(m_mediaPlayer); | 127 ASSERT(m_mediaPlayer); |
128 m_mediaPlayer->muteChanged(newMute); | 128 m_mediaPlayer->muteChanged(newMute); |
129 } | 129 } |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
168 m_videoLayer->setOpaque(m_opaque); | 168 m_videoLayer->setOpaque(m_opaque); |
169 #endif | 169 #endif |
170 } | 170 } |
171 | 171 |
172 void WebMediaPlayerClientImpl::sawUnsupportedTracks() | 172 void WebMediaPlayerClientImpl::sawUnsupportedTracks() |
173 { | 173 { |
174 ASSERT(m_mediaPlayer); | 174 ASSERT(m_mediaPlayer); |
175 m_mediaPlayer->mediaPlayerClient()->mediaPlayerSawUnsupportedTracks(m_mediaP layer); | 175 m_mediaPlayer->mediaPlayerClient()->mediaPlayerSawUnsupportedTracks(m_mediaP layer); |
176 } | 176 } |
177 | 177 |
178 float WebMediaPlayerClientImpl::volume() const | 178 double WebMediaPlayerClientImpl::volume() const |
179 { | 179 { |
180 if (m_mediaPlayer) | 180 if (m_mediaPlayer) |
181 return m_mediaPlayer->volume(); | 181 return m_mediaPlayer->volume(); |
182 return 0.0f; | 182 return 0.0; |
183 } | 183 } |
184 | 184 |
185 void WebMediaPlayerClientImpl::playbackStateChanged() | 185 void WebMediaPlayerClientImpl::playbackStateChanged() |
186 { | 186 { |
187 ASSERT(m_mediaPlayer); | 187 ASSERT(m_mediaPlayer); |
188 m_mediaPlayer->playbackStateChanged(); | 188 m_mediaPlayer->playbackStateChanged(); |
189 } | 189 } |
190 | 190 |
191 WebMediaPlayer::Preload WebMediaPlayerClientImpl::preload() const | 191 WebMediaPlayer::Preload WebMediaPlayerClientImpl::preload() const |
192 { | 192 { |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
457 return m_webMediaPlayer->hasAudio(); | 457 return m_webMediaPlayer->hasAudio(); |
458 return false; | 458 return false; |
459 } | 459 } |
460 | 460 |
461 void WebMediaPlayerClientImpl::setVisible(bool visible) | 461 void WebMediaPlayerClientImpl::setVisible(bool visible) |
462 { | 462 { |
463 if (m_webMediaPlayer) | 463 if (m_webMediaPlayer) |
464 m_webMediaPlayer->setVisible(visible); | 464 m_webMediaPlayer->setVisible(visible); |
465 } | 465 } |
466 | 466 |
467 float WebMediaPlayerClientImpl::duration() const | 467 double WebMediaPlayerClientImpl::duration() const |
468 { | 468 { |
469 if (m_webMediaPlayer) | 469 if (m_webMediaPlayer) |
470 return m_webMediaPlayer->duration(); | 470 return m_webMediaPlayer->durationFloat(); |
471 return 0.0f; | 471 return 0.0f; |
472 } | 472 } |
473 | 473 |
474 float WebMediaPlayerClientImpl::currentTime() const | 474 double WebMediaPlayerClientImpl::currentTime() const |
475 { | 475 { |
476 if (m_webMediaPlayer) | 476 if (m_webMediaPlayer) |
477 return m_webMediaPlayer->currentTime(); | 477 return m_webMediaPlayer->currentTimeFloat(); |
478 return 0.0f; | 478 return 0.0f; |
479 } | 479 } |
480 | 480 |
481 void WebMediaPlayerClientImpl::seek(float time) | 481 void WebMediaPlayerClientImpl::seek(double time) |
482 { | 482 { |
483 if (m_webMediaPlayer) | 483 if (m_webMediaPlayer) |
484 m_webMediaPlayer->seek(time); | 484 m_webMediaPlayer->seekFloat(time); |
485 } | 485 } |
486 | 486 |
487 bool WebMediaPlayerClientImpl::seeking() const | 487 bool WebMediaPlayerClientImpl::seeking() const |
488 { | 488 { |
489 if (m_webMediaPlayer) | 489 if (m_webMediaPlayer) |
490 return m_webMediaPlayer->seeking(); | 490 return m_webMediaPlayer->seeking(); |
491 return false; | 491 return false; |
492 } | 492 } |
493 | 493 |
494 void WebMediaPlayerClientImpl::setEndTime(float time) | 494 void WebMediaPlayerClientImpl::setEndTime(double time) |
495 { | 495 { |
496 if (m_webMediaPlayer) | 496 if (m_webMediaPlayer) |
497 m_webMediaPlayer->setEndTime(time); | 497 m_webMediaPlayer->setEndTimeFloat(time); |
498 } | 498 } |
499 | 499 |
500 void WebMediaPlayerClientImpl::setRate(float rate) | 500 void WebMediaPlayerClientImpl::setRate(double rate) |
501 { | 501 { |
502 if (m_webMediaPlayer) | 502 if (m_webMediaPlayer) |
503 m_webMediaPlayer->setRate(rate); | 503 m_webMediaPlayer->setRateFloat(rate); |
504 } | 504 } |
505 | 505 |
506 bool WebMediaPlayerClientImpl::paused() const | 506 bool WebMediaPlayerClientImpl::paused() const |
507 { | 507 { |
508 if (m_webMediaPlayer) | 508 if (m_webMediaPlayer) |
509 return m_webMediaPlayer->paused(); | 509 return m_webMediaPlayer->paused(); |
510 return false; | 510 return false; |
511 } | 511 } |
512 | 512 |
513 bool WebMediaPlayerClientImpl::supportsFullscreen() const | 513 bool WebMediaPlayerClientImpl::supportsFullscreen() const |
514 { | 514 { |
515 if (m_webMediaPlayer) | 515 if (m_webMediaPlayer) |
516 return m_webMediaPlayer->supportsFullscreen(); | 516 return m_webMediaPlayer->supportsFullscreen(); |
517 return false; | 517 return false; |
518 } | 518 } |
519 | 519 |
520 bool WebMediaPlayerClientImpl::supportsSave() const | 520 bool WebMediaPlayerClientImpl::supportsSave() const |
521 { | 521 { |
522 if (m_webMediaPlayer) | 522 if (m_webMediaPlayer) |
523 return m_webMediaPlayer->supportsSave(); | 523 return m_webMediaPlayer->supportsSave(); |
524 return false; | 524 return false; |
525 } | 525 } |
526 | 526 |
527 void WebMediaPlayerClientImpl::setVolume(float volume) | 527 void WebMediaPlayerClientImpl::setVolume(double volume) |
528 { | 528 { |
529 if (m_webMediaPlayer) | 529 if (m_webMediaPlayer) |
530 m_webMediaPlayer->setVolume(volume); | 530 m_webMediaPlayer->setVolumeFloat(volume); |
eseidel
2013/04/06 04:04:46
Float?
acolwell GONE FROM CHROMIUM
2013/04/06 04:17:06
Yes. These are the new temporary method names. The
| |
531 } | 531 } |
532 | 532 |
533 MediaPlayer::NetworkState WebMediaPlayerClientImpl::networkState() const | 533 MediaPlayer::NetworkState WebMediaPlayerClientImpl::networkState() const |
534 { | 534 { |
535 if (m_webMediaPlayer) | 535 if (m_webMediaPlayer) |
536 return static_cast<MediaPlayer::NetworkState>(m_webMediaPlayer->networkS tate()); | 536 return static_cast<MediaPlayer::NetworkState>(m_webMediaPlayer->networkS tate()); |
537 return MediaPlayer::Empty; | 537 return MediaPlayer::Empty; |
538 } | 538 } |
539 | 539 |
540 MediaPlayer::ReadyState WebMediaPlayerClientImpl::readyState() const | 540 MediaPlayer::ReadyState WebMediaPlayerClientImpl::readyState() const |
541 { | 541 { |
542 if (m_webMediaPlayer) | 542 if (m_webMediaPlayer) |
543 return static_cast<MediaPlayer::ReadyState>(m_webMediaPlayer->readyState ()); | 543 return static_cast<MediaPlayer::ReadyState>(m_webMediaPlayer->readyState ()); |
544 return MediaPlayer::HaveNothing; | 544 return MediaPlayer::HaveNothing; |
545 } | 545 } |
546 | 546 |
547 float WebMediaPlayerClientImpl::maxTimeSeekable() const | 547 double WebMediaPlayerClientImpl::maxTimeSeekable() const |
548 { | 548 { |
549 if (m_webMediaPlayer) | 549 if (m_webMediaPlayer) |
550 return m_webMediaPlayer->maxTimeSeekable(); | 550 return m_webMediaPlayer->maxTimeSeekableFloat(); |
eseidel
2013/04/06 04:04:46
Float?
acolwell GONE FROM CHROMIUM
2013/04/06 04:17:06
Yes. The idea here is the same as above. In this c
| |
551 return 0.0f; | 551 return 0.0; |
552 } | 552 } |
553 | 553 |
554 PassRefPtr<TimeRanges> WebMediaPlayerClientImpl::buffered() const | 554 PassRefPtr<TimeRanges> WebMediaPlayerClientImpl::buffered() const |
555 { | 555 { |
556 if (m_webMediaPlayer) { | 556 if (m_webMediaPlayer) { |
557 const WebTimeRanges& webRanges = m_webMediaPlayer->buffered(); | 557 const WebTimeRanges& webRanges = m_webMediaPlayer->buffered(); |
558 | 558 |
559 // FIXME: Save the time ranges in a member variable and update it when n eeded. | 559 // FIXME: Save the time ranges in a member variable and update it when n eeded. |
560 RefPtr<TimeRanges> ranges = TimeRanges::create(); | 560 RefPtr<TimeRanges> ranges = TimeRanges::create(); |
561 for (size_t i = 0; i < webRanges.size(); ++i) | 561 for (size_t i = 0; i < webRanges.size(); ++i) |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
655 } | 655 } |
656 | 656 |
657 MediaPlayer::MovieLoadType WebMediaPlayerClientImpl::movieLoadType() const | 657 MediaPlayer::MovieLoadType WebMediaPlayerClientImpl::movieLoadType() const |
658 { | 658 { |
659 if (m_webMediaPlayer) | 659 if (m_webMediaPlayer) |
660 return static_cast<MediaPlayer::MovieLoadType>( | 660 return static_cast<MediaPlayer::MovieLoadType>( |
661 m_webMediaPlayer->movieLoadType()); | 661 m_webMediaPlayer->movieLoadType()); |
662 return MediaPlayer::Unknown; | 662 return MediaPlayer::Unknown; |
663 } | 663 } |
664 | 664 |
665 float WebMediaPlayerClientImpl::mediaTimeForTimeValue(float timeValue) const | 665 double WebMediaPlayerClientImpl::mediaTimeForTimeValue(double timeValue) const |
666 { | 666 { |
667 if (m_webMediaPlayer) | 667 if (m_webMediaPlayer) |
668 return m_webMediaPlayer->mediaTimeForTimeValue(timeValue); | 668 return m_webMediaPlayer->mediaTimeForTimeValueFloat(timeValue); |
eseidel
2013/04/06 04:04:46
This looks wrong?
acolwell GONE FROM CHROMIUM
2013/04/06 04:17:06
No. Same reasoning as above.
| |
669 return timeValue; | 669 return timeValue; |
670 } | 670 } |
671 | 671 |
672 unsigned WebMediaPlayerClientImpl::decodedFrameCount() const | 672 unsigned WebMediaPlayerClientImpl::decodedFrameCount() const |
673 { | 673 { |
674 if (m_webMediaPlayer) | 674 if (m_webMediaPlayer) |
675 return m_webMediaPlayer->decodedFrameCount(); | 675 return m_webMediaPlayer->decodedFrameCount(); |
676 return 0; | 676 return 0; |
677 } | 677 } |
678 | 678 |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
823 { | 823 { |
824 if (m_client) | 824 if (m_client) |
825 m_client->setFormat(numberOfChannels, sampleRate); | 825 m_client->setFormat(numberOfChannels, sampleRate); |
826 } | 826 } |
827 | 827 |
828 #endif | 828 #endif |
829 | 829 |
830 } // namespace WebKit | 830 } // namespace WebKit |
831 | 831 |
832 #endif // ENABLE(VIDEO) | 832 #endif // ENABLE(VIDEO) |
OLD | NEW |