Fix capitalization conventions. Fix signed/unsigned compiler warnings.

MythTV · May 25, 2012 · 59f4a77 · 59f4a77
1 parent 06166e0
commit 59f4a77
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -577,7 +577,7 @@ bool AvFormatDecoder::DoFastForward(long long desiredFrame, bool discardFrames)
     ts += (long long)seekts;
 
     // XXX figure out how to do snapping in this case
-    bool exactseeks = !DecoderBase::getSeekSnap();
+    bool exactseeks = !DecoderBase::GetSeekSnap();
 
     int flags = (dorewind || exactseeks) ? AVSEEK_FLAG_BACKWARD : 0;
 

diff --git a/mythtv/libs/libmythtv/decoderbase.cpp b/mythtv/libs/libmythtv/decoderbase.cpp
@@ -99,7 +99,7 @@ void DecoderBase::SeekReset(long long, uint, bool, bool)
     readAdjust = 0;
 }
 
-void DecoderBase::setWatchingRecording(bool mode)
+void DecoderBase::SetWatchingRecording(bool mode)
 {
     bool wereWatchingRecording = watchingrecording;
 
@@ -522,7 +522,7 @@ bool DecoderBase::DoRewind(long long desiredFrame, bool discardFrames)
 
     // Do any Extra frame-by-frame seeking for exactseeks mode
     // And flush pre-seek frame if we are allowed to and need to..
-    int normalframes = desiredFrame - (framesPlayed - 1) > seeksnap
+    int normalframes = (uint64_t)(desiredFrame - (framesPlayed - 1)) > seeksnap
         ? desiredFrame - framesPlayed : 0;
     normalframes = max(normalframes, 0);
     SeekReset(lastKey, normalframes, true, discardFrames);
@@ -736,7 +736,7 @@ bool DecoderBase::DoFastForward(long long desiredFrame, bool discardFrames)
 
     // Do any Extra frame-by-frame seeking for exactseeks mode
     // And flush pre-seek frame if we are allowed to and need to..
-    int normalframes = desiredFrame - (framesPlayed - 1) > seeksnap
+    int normalframes = (uint64_t)(desiredFrame - (framesPlayed - 1)) > seeksnap
         ? desiredFrame - framesPlayed : 0;
     normalframes = max(normalframes, 0);
     SeekReset(lastKey, normalframes, needflush, discardFrames);

diff --git a/mythtv/libs/libmythtv/decoderbase.h b/mythtv/libs/libmythtv/decoderbase.h
@@ -113,9 +113,9 @@ class DecoderBase
     virtual void SetEof(bool eof)  { ateof = eof;  }
     bool         GetEof(void) const { return ateof; }
 
-    void setSeekSnap(uint64_t snap)  { seeksnap = snap; }
-    uint64_t getSeekSnap(void) const { return seeksnap;  }
-    void setLiveTVMode(bool live)  { livetv = live;      }
+    void SetSeekSnap(uint64_t snap)  { seeksnap = snap; }
+    uint64_t GetSeekSnap(void) const { return seeksnap;  }
+    void SetLiveTVMode(bool live)  { livetv = live;      }
 
     // Must be done while player is paused.
     void SetProgramInfo(const ProgramInfo &pginfo);
@@ -124,7 +124,7 @@ class DecoderBase
     /// Disables AC3/DTS pass through
     virtual void SetDisablePassThrough(bool disable) { (void)disable; }
 
-    virtual void setWatchingRecording(bool mode);
+    virtual void SetWatchingRecording(bool mode);
     /// Demux, preprocess and possibly decode a frame of video/audio.
     virtual bool GetFrame(DecodeType) = 0;
     MythPlayer *GetPlayer() { return m_parent; }
@@ -177,7 +177,7 @@ class DecoderBase
     virtual void SeekReset(long long newkey, uint skipFrames,
                            bool doFlush, bool discardFrames);
 
-    void setTranscoding(bool value) { transcoding = value; };
+    void SetTranscoding(bool value) { transcoding = value; };
 
     bool IsErrored() const { return errored; }
 

diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -325,7 +325,7 @@ void MythPlayer::SetWatchingRecording(bool mode)
 {
     watchingrecording = mode;
     if (decoder)
-        decoder->setWatchingRecording(mode);
+        decoder->SetWatchingRecording(mode);
 }
 
 bool MythPlayer::IsWatchingInprogress(void) const
@@ -965,10 +965,10 @@ int MythPlayer::OpenFile(uint retries)
         return -1;
     }
 
-    decoder->setSeekSnap(0);
-    decoder->setLiveTVMode(livetv);
-    decoder->setWatchingRecording(watchingrecording);
-    decoder->setTranscoding(transcoding);
+    decoder->SetSeekSnap(0);
+    decoder->SetLiveTVMode(livetv);
+    decoder->SetWatchingRecording(watchingrecording);
+    decoder->SetTranscoding(transcoding);
     CheckExtraAudioDecode();
 
     // Set 'no_video_decode' to true for audio only decodeing
@@ -3209,7 +3209,7 @@ void MythPlayer::SetTranscoding(bool value)
     transcoding = value;
 
     if (decoder)
-        decoder->setTranscoding(value);
+        decoder->SetTranscoding(value);
 }
 
 bool MythPlayer::AddPIPPlayer(MythPlayer *pip, PIPLocation loc, uint timeout)
@@ -3671,7 +3671,7 @@ void MythPlayer::WaitForSeek(uint64_t frame, uint64_t seeksnap_wanted)
     if (!decoder)
         return;
 
-    decoder->setSeekSnap(seeksnap_wanted);
+    decoder->SetSeekSnap(seeksnap_wanted);
 
     bool islivetvcur = (livetv && player_ctx->tvchain &&
                         !player_ctx->tvchain->HasNext());
@@ -4418,7 +4418,7 @@ void MythPlayer::InitForTranscode(bool copyaudio, bool copyvideo)
 
     if (decoder)
     {
-        decoder->setSeekSnap(0);
+        decoder->SetSeekSnap(0);
         decoder->SetLowBuffers(true);
     }
 }