Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: Source/core/platform/graphics/MediaPlayer.cpp

Issue 14362037: Remove USE(GSTREAMER) and USE(WEBAUDIO_GSTREAMER) guards. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 29 matching lines...) Expand all
40 #include "Settings.h" 40 #include "Settings.h"
41 #include "TimeRanges.h" 41 #include "TimeRanges.h"
42 #include <wtf/text/CString.h> 42 #include <wtf/text/CString.h>
43 43
44 #include "InbandTextTrackPrivate.h" 44 #include "InbandTextTrackPrivate.h"
45 45
46 #if ENABLE(MEDIA_SOURCE) 46 #if ENABLE(MEDIA_SOURCE)
47 #include "MediaSource.h" 47 #include "MediaSource.h"
48 #endif 48 #endif
49 49
50 #if USE(GSTREAMER)
51 #include "MediaPlayerPrivateGStreamer.h"
52 #define PlatformMediaEngineClassName MediaPlayerPrivateGStreamer
53 #endif
54
55 #include "MediaPlayerPrivateChromium.h" 50 #include "MediaPlayerPrivateChromium.h"
56 #define PlatformMediaEngineClassName MediaPlayerPrivate 51 #define PlatformMediaEngineClassName MediaPlayerPrivate
57 52
58 namespace WebCore { 53 namespace WebCore {
59 54
60 const PlatformMedia NoPlatformMedia = { PlatformMedia::None, {0} }; 55 const PlatformMedia NoPlatformMedia = { PlatformMedia::None, {0} };
61 56
62 // a null player to make MediaPlayer logic simpler 57 // a null player to make MediaPlayer logic simpler
63 58
64 class NullMediaPlayerPrivate : public MediaPlayerPrivateInterface { 59 class NullMediaPlayerPrivate : public MediaPlayerPrivateInterface {
(...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 { 1000 {
1006 return m_private->textTrackMenu(); 1001 return m_private->textTrackMenu();
1007 } 1002 }
1008 #endif // USE(PLATFORM_TEXT_TRACK_MENU) 1003 #endif // USE(PLATFORM_TEXT_TRACK_MENU)
1009 1004
1010 void MediaPlayer::resetMediaEngines() 1005 void MediaPlayer::resetMediaEngines()
1011 { 1006 {
1012 installedMediaEngines(ResetEngines); 1007 installedMediaEngines(ResetEngines);
1013 } 1008 }
1014 1009
1015 #if USE(GSTREAMER)
1016 void MediaPlayer::simulateAudioInterruption()
1017 {
1018 if (!m_private)
1019 return;
1020
1021 m_private->simulateAudioInterruption();
1022 }
1023 #endif
1024
1025 } 1010 }
1026 1011
1027 #endif 1012 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698