Rename fakeOut -> wrapper

elventian · Apr 1, 2020 · f662162 · f662162
1 parent 5f3bb72
commit f662162
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/ntff_es.cpp b/src/ntff_es.cpp
@@ -159,29 +159,29 @@ namespace Ntff
 
 OutStream::OutStream(es_out_t *out, Player *player) : curTime(0), framesNum(0), out(out), player(player)
 {
-	fakeOut.p_sys = (es_out_sys_t *)this;
+	wrapper.p_sys = (es_out_sys_t *)this;
 
-	fakeOut.pf_add = [] (es_out_t *out, const es_format_t *format)
+	wrapper.pf_add = [] (es_out_t *out, const es_format_t *format)
 	{
 		return ((OutStream*)out->p_sys)->addElemental(format);
 	};
 
-	fakeOut.pf_send = [](es_out_t *out, es_out_id_t *id, block_t *block)
+	wrapper.pf_send = [](es_out_t *out, es_out_id_t *id, block_t *block)
 	{
 		return ((OutStream*)out->p_sys)->sendBlock(id, block);
 	};
 
-	fakeOut.pf_del = [](es_out_t *out, es_out_id_t *id)
+	wrapper.pf_del = [](es_out_t *out, es_out_id_t *id)
 	{
 		((OutStream*)out->p_sys)->removeElemental(id);
 	};
 
-	fakeOut.pf_control = [](es_out_t *out, int i_query, va_list va)
+	wrapper.pf_control = [](es_out_t *out, int i_query, va_list va)
 	{
 		return ((OutStream*)out->p_sys)->control(i_query, va);
 	};
 
-	fakeOut.pf_destroy = [](es_out_t *out)
+	wrapper.pf_destroy = [](es_out_t *out)
 	{
 		((OutStream*)out->p_sys)->destroyOutStream();
 	};

diff --git a/src/ntff_es.h b/src/ntff_es.h
@@ -47,7 +47,7 @@ class OutStream
 	void resetFramesNum() { framesNum = 0; }
 	mtime_t getTime() const { return curTime; }
 	uint32_t getFramesNum() const { return framesNum; }
-	es_out_t *getFakeOutStream() { return &fakeOut; }
+	es_out_t *getWrapperStream() { return &wrapper; }
 
 	es_out_id_t *addElemental(const es_format_t *format);
 	void removeElemental(es_out_id_t *id);
@@ -61,7 +61,7 @@ class OutStream
 	uint32_t framesNum;
 
 	es_out_t *out;
-	es_out_t fakeOut;
+	es_out_t wrapper;
 	Player *player;
 };
 

diff --git a/src/ntff_player.cpp b/src/ntff_player.cpp
@@ -26,7 +26,7 @@ bool Player::isValid() const
 
 void Player::addFile(const Interval &interval, const std::string &filename)
 {
-	items[interval.in] = Item(obj, interval, out->getFakeOutStream(), filename);
+	items[interval.in] = Item(obj, interval, out->getWrapperStream(), filename);
 }
 
 bool Player::timeIsInPlayInterval(mtime_t time) const