AudioSync: Allow the audio sync offset to be set directly.

Again, not currently plugged into anything - so not actionable.
MythTV · Nov 16, 2011 · cb14f67 · cb14f67
1 parent 8bced84
commit cb14f67
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -3204,9 +3204,12 @@ PIPLocation MythPlayer::GetNextPIPLocation(void) const
     return kPIP_END;
 }
 
-int64_t MythPlayer::AdjustAudioTimecodeOffset(int64_t v)
+int64_t MythPlayer::AdjustAudioTimecodeOffset(int64_t v, int newsync)
 {
-    tc_wrap[TC_AUDIO] += v;
+    if ((newsync >= -1000) && (newsync <= 1000))
+        tc_wrap[TC_AUDIO] = newsync;
+    else
+        tc_wrap[TC_AUDIO] += v;
     gCoreContext->SaveSetting("AudioSyncOffset", tc_wrap[TC_AUDIO]);
     return tc_wrap[TC_AUDIO];
 }

diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h
@@ -462,7 +462,7 @@ class MTV_PUBLIC MythPlayer
     void SetTeletextPage(uint page);
 
     // Time Code adjustment stuff
-    int64_t AdjustAudioTimecodeOffset(int64_t v);
+    int64_t AdjustAudioTimecodeOffset(int64_t v, int newsync = -9999);
     int64_t GetAudioTimecodeOffset(void) const
         { return tc_wrap[TC_AUDIO]; }
 

diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
@@ -8000,7 +8000,7 @@ void TV::ToggleUpmix(PlayerContext *ctx)
 }
 
 // dir in 10ms jumps
-void TV::ChangeAudioSync(PlayerContext *ctx, int dir)
+void TV::ChangeAudioSync(PlayerContext *ctx, int dir, int newsync)
 {
     long long newval;
 
@@ -8012,7 +8012,10 @@ void TV::ChangeAudioSync(PlayerContext *ctx, int dir)
     }
 
     audiosyncAdjustment = true;
-    newval = ctx->player->AdjustAudioTimecodeOffset(dir * 10);
+    if ((newsync >= -1000) && (newsync <= 1000))
+        newval = ctx->player->AdjustAudioTimecodeOffset(0, newsync);
+    else
+        newval = ctx->player->AdjustAudioTimecodeOffset(dir * 10);
     ctx->UnlockDeletePlayer(__FILE__, __LINE__);
 
     if (!browsehelper->IsBrowsing())

diff --git a/mythtv/libs/libmythtv/tv_play.h b/mythtv/libs/libmythtv/tv_play.h
@@ -405,7 +405,7 @@ class MTV_PUBLIC TV : public QObject
                                  const QStringList &actions);
 
     void ToggleUpmix(PlayerContext*);
-    void ChangeAudioSync(PlayerContext*, int dir);
+    void ChangeAudioSync(PlayerContext*, int dir, int newsync = -9999);
     bool AudioSyncHandleAction(PlayerContext*, const QStringList &actions);
 
     float StopFFRew(PlayerContext*);