[mythtv-cmyth] Adapt SetBookmark.

- Changed return type to bool. - Adapt to cmyth_set_bookmark returns 0 on success
opdenkamp · Oct 21, 2012 · 126cad6 · 126cad6
1 parent e6a36ad
commit 126cad6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.cpp b/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.cpp
@@ -358,11 +358,11 @@ MythFile MythConnection::ConnectPath(const CStdString &filename, const CStdStrin
   return MythFile(file, *this);
 }
 
-int MythConnection::SetBookmark(MythProgramInfo &recording, long long bookmark)
+bool MythConnection::SetBookmark(MythProgramInfo &recording, long long bookmark)
 {
   int retval;
   CMYTH_CONN_CALL(retval, retval < 0, cmyth_set_bookmark(*m_conn_t, *recording.m_proginfo_t, bookmark));
-  return retval;
+  return retval >= 0;
 }
 
 long long MythConnection::GetBookmark(MythProgramInfo &recording)

diff --git a/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.h b/addons/pvr.mythtv.cmyth/src/cppmyth/MythConnection.h
@@ -86,7 +86,7 @@ class MythConnection
 
   // Bookmarks
   long long GetBookmark(MythProgramInfo &recording);
-  int SetBookmark(MythProgramInfo &recording, long long bookmark);
+  bool SetBookmark(MythProgramInfo &recording, long long bookmark);
 
 private:
   boost::shared_ptr<MythPointerThreadSafe<cmyth_conn_t> > m_conn_t;

diff --git a/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.cpp b/addons/pvr.mythtv.cmyth/src/pvrclient-mythtv.cpp
@@ -620,20 +620,19 @@ PVR_ERROR PVRClientMythTV::SetRecordingLastPlayedPosition(const PVR_RECORDING &r
     }
 
     // Write the bookmark
-    int retval = m_con.SetBookmark(it->second, frameOffset);
-    if (retval == 1)
+    if (m_con.SetBookmark(it->second, frameOffset))
     {
       if (g_bExtraDebug)
       {
-        XBMC->Log(LOG_ERROR, "%s - Setting Bookmark successful: %d)", __FUNCTION__);
+        XBMC->Log(LOG_ERROR, "%s - Setting Bookmark successful", __FUNCTION__);
       }
       return PVR_ERROR_NO_ERROR;
     }
     else
     {
       if (g_bExtraDebug)
       {
-        XBMC->Log(LOG_ERROR, "%s - Setting Bookmark failed: %d)", __FUNCTION__, retval);
+        XBMC->Log(LOG_ERROR, "%s - Setting Bookmark failed", __FUNCTION__);
       }
       return PVR_ERROR_FAILED;
     }