summaryrefslogtreecommitdiffstats
path: root/media/tools
diff options
context:
space:
mode:
Diffstat (limited to 'media/tools')
-rw-r--r--media/tools/player_x11/data_source_logger.cc11
-rw-r--r--media/tools/player_x11/data_source_logger.h2
2 files changed, 4 insertions, 9 deletions
diff --git a/media/tools/player_x11/data_source_logger.cc b/media/tools/player_x11/data_source_logger.cc
index 204d8b3..d09b6bf 100644
--- a/media/tools/player_x11/data_source_logger.cc
+++ b/media/tools/player_x11/data_source_logger.cc
@@ -6,11 +6,6 @@
#include "base/logging.h"
#include "media/tools/player_x11/data_source_logger.h"
-static void LogAndRunStopClosure(const base::Closure& closure) {
- VLOG(1) << "Stop() finished";
- closure.Run();
-}
-
static void LogAndRunReadCB(
int64 position, int size,
const media::DataSource::ReadCB& read_cb, int result) {
@@ -25,9 +20,9 @@ DataSourceLogger::DataSourceLogger(
streaming_(streaming) {
}
-void DataSourceLogger::Stop(const base::Closure& closure) {
- VLOG(1) << "Stop() started";
- data_source_->Stop(base::Bind(&LogAndRunStopClosure, closure));
+void DataSourceLogger::Stop() {
+ VLOG(1) << "Stop()";
+ data_source_->Stop();
}
void DataSourceLogger::Read(
diff --git a/media/tools/player_x11/data_source_logger.h b/media/tools/player_x11/data_source_logger.h
index 5fdd9d4..1cb0a80 100644
--- a/media/tools/player_x11/data_source_logger.h
+++ b/media/tools/player_x11/data_source_logger.h
@@ -22,7 +22,7 @@ class DataSourceLogger : public media::DataSource {
virtual ~DataSourceLogger();
// media::DataSource implementation.
- virtual void Stop(const base::Closure& closure) OVERRIDE;
+ virtual void Stop() OVERRIDE;
virtual void Read(
int64 position, int size, uint8* data,
const media::DataSource::ReadCB& read_cb) OVERRIDE;