RIO-8751: Remove dependency of fileoutputnode on pvPlayer SDK

9 files changed, 6 insertions, 39 deletions

diff --git a/engines/player/test/src/test_pv_player_engine_testset10.cpp b/engines/player/test/src/test_pv_player_engine_testset10.cpp
index f03ac9520..cd314ce98 100644
--- a/engines/player/test/src/test_pv_player_engine_testset10.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset10.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,6 @@
 #include "pv_player_datasourceurl.h"
 #endif
 
-#ifndef PV_PLAYER_DATASINKFILENAME_H_INCLUDED
-#include "pv_player_datasinkfilename.h"
-#endif
-
 #ifndef PV_PLAYER_DATASINKPVMFNODE_H_INCLUDED
 #include "pv_player_datasinkpvmfnode.h"
 #endif
diff --git a/engines/player/test/src/test_pv_player_engine_testset11.cpp b/engines/player/test/src/test_pv_player_engine_testset11.cpp
index 573561195..4610941f0 100644
--- a/engines/player/test/src/test_pv_player_engine_testset11.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset11.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,6 @@
 #include "pv_player_datasourceurl.h"
 #endif
 
-#ifndef PV_PLAYER_DATASINKFILENAME_H_INCLUDED
-#include "pv_player_datasinkfilename.h"
-#endif
-
 #ifndef PV_PLAYER_DATASINKPVMFNODE_H_INCLUDED
 #include "pv_player_datasinkpvmfnode.h"
 #endif
diff --git a/engines/player/test/src/test_pv_player_engine_testset12.cpp b/engines/player/test/src/test_pv_player_engine_testset12.cpp
index bac389e39..ee0a2db8a 100644
--- a/engines/player/test/src/test_pv_player_engine_testset12.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset12.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,6 @@
 #include "pv_player_datasourceurl.h"
 #endif
 
-#ifndef PV_PLAYER_DATASINKFILENAME_H_INCLUDED
-#include "pv_player_datasinkfilename.h"
-#endif
-
 #ifndef PV_PLAYER_DATASINKPVMFNODE_H_INCLUDED
 #include "pv_player_datasinkpvmfnode.h"
 #endif
diff --git a/engines/player/test/src/test_pv_player_engine_testset13.cpp b/engines/player/test/src/test_pv_player_engine_testset13.cpp
index 22cfacc56..0eafaf5d0 100644
--- a/engines/player/test/src/test_pv_player_engine_testset13.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset13.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,6 @@
 #include "pv_player_datasourceurl.h"
 #endif
 
-#ifndef PV_PLAYER_DATASINKFILENAME_H_INCLUDED
-#include "pv_player_datasinkfilename.h"
-#endif
-
 #ifndef PV_PLAYER_DATASINKPVMFNODE_H_INCLUDED
 #include "pv_player_datasinkpvmfnode.h"
 #endif
diff --git a/engines/player/test/src/test_pv_player_engine_testset7.cpp b/engines/player/test/src/test_pv_player_engine_testset7.cpp
index a77b703e1..c23f0c1cc 100644
--- a/engines/player/test/src/test_pv_player_engine_testset7.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset7.cpp
@@ -27,10 +27,6 @@
 #include "oscl_tickcount.h"
 #endif
 
-#ifndef PV_PLAYER_DATASINKFILENAME_H_INCLUDED
-#include "pv_player_datasinkfilename.h"
-#endif
-
 #ifndef PV_PLAYER_DATASINKPVMFNODE_H_INCLUDED
 #include "pv_player_datasinkpvmfnode.h"
 #endif
diff --git a/engines/player/test/src/test_pv_player_engine_testset8.cpp b/engines/player/test/src/test_pv_player_engine_testset8.cpp
index 1a217794f..5a98f506f 100644
--- a/engines/player/test/src/test_pv_player_engine_testset8.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset8.cpp
@@ -27,10 +27,6 @@
 #include "oscl_tickcount.h"
 #endif
 
-#ifndef PV_PLAYER_DATASINKFILENAME_H_INCLUDED
-#include "pv_player_datasinkfilename.h"
-#endif
-
 #ifndef PV_PLAYER_DATASINKPVMFNODE_H_INCLUDED
 #include "pv_player_datasinkpvmfnode.h"
 #endif
diff --git a/engines/player/test/src/test_pv_player_engine_testset9.cpp b/engines/player/test/src/test_pv_player_engine_testset9.cpp
index 0fd0dc4b6..31f3a03ca 100644
--- a/engines/player/test/src/test_pv_player_engine_testset9.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset9.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,6 @@
 #include "pv_player_datasourceurl.h"
 #endif
 
-#ifndef PV_PLAYER_DATASINKFILENAME_H_INCLUDED
-#include "pv_player_datasinkfilename.h"
-#endif
-
 #ifndef PV_PLAYER_DATASINKPVMFNODE_H_INCLUDED
 #include "pv_player_datasinkpvmfnode.h"
 #endif
diff --git a/engines/player/test/src/test_pv_player_engine_testset_cpmdlapassthru.cpp b/engines/player/test/src/test_pv_player_engine_testset_cpmdlapassthru.cpp
index f053d56d6..48ebf3d03 100644
--- a/engines/player/test/src/test_pv_player_engine_testset_cpmdlapassthru.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset_cpmdlapassthru.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,6 @@
 #include "pv_player_datasourceurl.h"
 #endif
 
-#ifndef PV_PLAYER_DATASINKFILENAME_H_INCLUDED
-#include "pv_player_datasinkfilename.h"
-#endif
-
 #ifndef PV_PLAYER_DATASINKPVMFNODE_H_INCLUDED
 #include "pv_player_datasinkpvmfnode.h"
 #endif
diff --git a/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp b/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp
index 2e44cb7d1..376d0edc6 100644
--- a/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp
@@ -19,7 +19,6 @@
 #include "test_pv_player_engine_testset_playlist_clipinfo.h"
 #include "oscl_error_codes.h"
 #include "oscl_tickcount.h"
-#include "pv_player_datasinkfilename.h"
 #include "pv_player_datasinkpvmfnode.h"
 #include "pvmi_media_io_fileoutput.h"
 #include "pv_media_output_node_factory.h"