Extension of callback interface to identify caller

diff --git a/afeed.cc b/afeed.cc
index 07480d0f929affdbedf5f8c84876ba5dfd446572..8ff3f07e8b401e8a1d86b1a4cab04cbbbca315e6 100644 (file)
--- a/afeed.cc
+++ b/afeed.cc
@@ -77,7 +77,7 @@ void AFeed::threadMethod()
       if (alen)
       {
       //  Log::getInstance()->log("AFeed", Log::DEBUG, "Written %i", alen);
-        cb.call();
+        cb.call(this);
       }
       else
       {

diff --git a/afeedr.cc b/afeedr.cc
index 1dd8a01482bd7e98d949ff5ff481fb56f76e7065..69385e6562a684ea977c93e11f6aa89c2f64f9c0 100644 (file)
--- a/afeedr.cc
+++ b/afeedr.cc
@@ -62,7 +62,7 @@ void AFeedR::threadMethod()
     if (alen)
     {
       Log::getInstance()->log("AFeedR", Log::DEBUG, "Written %i", alen);
-      cb.call();
+      cb.call(this);
     }
     else
     {

diff --git a/callback.h b/callback.h
index 3fbc2e0181d9d3ef973248843f42874bf80ae4cd..01d5a23ac1d4d83330dfa567813d9daa13298121 100644 (file)
--- a/callback.h
+++ b/callback.h
@@ -24,7 +24,7 @@
 class Callback
 {
   public:
-    virtual void call()=0;
+    virtual void call(void* caller)=0;
 };
 
 #endif

diff --git a/player.h b/player.h
index 2a8ac2de4ddd4db44f679e4ecee2016d126ff7f2..991d49c3face9992aa4f7ee1b476f59264066c94 100644 (file)
--- a/player.h
+++ b/player.h
@@ -49,7 +49,7 @@ class Player : public Thread, public Callback
     virtual void test2()=0;
 #endif
 
-    virtual void call()=0; // for callback interface
+    virtual void call(void*)=0; // for callback interface
     virtual void threadMethod()=0; // for thread interface
     virtual void threadPostStopCleanup()=0;
 

diff --git a/playerradio.cc b/playerradio.cc
index db0918ed097c10f3d844374ccc2a0afdd7f620c6..03d291d9c2dfb2922ee6a650ebd310263d529ea2 100644 (file)
--- a/playerradio.cc
+++ b/playerradio.cc
@@ -110,7 +110,7 @@ int PlayerRadio::play()
 
 
     audio->play();
-    call();
+    call(this);
 
     return 1;
   }
@@ -296,7 +296,7 @@ void PlayerRadio::jumpToPercent(int percent)
 }
 
 
-void PlayerRadio::call()
+void PlayerRadio::call(void* caller)
 {
   Log::getInstance()->log("PlayerRadio", Log::DEBUG, "playerradio called\n");
 //  threadSignalNoLock();

diff --git a/playerradio.h b/playerradio.h
index dab5d3ea3a944910941e35982d159e041b5bafe2..f1fa75666276f94fd848f8b0e7904262c15e7313 100644 (file)
--- a/playerradio.h
+++ b/playerradio.h
@@ -49,7 +49,7 @@ class PlayerRadio : public Player
     void jumpToPercent(int percent);
     void skipForward();
     void skipBackward();
-    void call(); // for callback interface
+    void call(void*); // for callback interface
     void setPosition(ULLONG position);
     void setLength(ULLONG length);
 

diff --git a/playervideo.cc b/playervideo.cc
index 49a8276a3bf37156252d4b6adcd84c3873b3d1d8..8bba1bf12fb599602344c120fdd9bccf5dd527cf 100644 (file)
--- a/playervideo.cc
+++ b/playervideo.cc
@@ -488,7 +488,7 @@ void PlayerVideo::jumpToPercent(int percent)
 }
 
 
-void PlayerVideo::call()
+void PlayerVideo::call(void* caller)
 {
   threadSignalNoLock();
 }

diff --git a/playervideo.h b/playervideo.h
index 4b777e166d00c29253fa78a67f0cb1f0a678125e..28963f94635ac0cd174c65fee76cd2e8f3da1eb0 100644 (file)
--- a/playervideo.h
+++ b/playervideo.h
@@ -53,7 +53,7 @@ class PlayerVideo : public Player
     void jumpToPercent(int percent);
     void skipForward(int seconds);
     void skipBackward(int seconds);
-    void call(); // for callback interface
+    void call(void*); // for callback interface
     void setPosition(ULLONG position);
     void setLength(ULLONG length);
 #ifdef DEV

diff --git a/vfeed.cc b/vfeed.cc
index 4f8001adf6e0a6b7dbe804bfb8ddfb4794f6832d..7ce9ad068519b432fea1ec741d97faa45125cc11 100644 (file)
--- a/vfeed.cc
+++ b/vfeed.cc
@@ -61,7 +61,7 @@ void VFeed::threadMethod()
     if (vlen)
     {
   //    Log::getInstance()->log("VFeed", Log::DEBUG, "Written %i", vlen);
-      cb.call();
+      cb.call(this);
     }
     else
     {