diff --git a/mythplugins/mytharchive/mytharchive/thumbfinder.h b/mythplugins/mytharchive/mytharchive/thumbfinder.h index 0510f70f3ef..a73faa37716 100644 --- a/mythplugins/mytharchive/mytharchive/thumbfinder.h +++ b/mythplugins/mytharchive/mytharchive/thumbfinder.h @@ -85,7 +85,7 @@ class ThumbFinder : public MythScreenType MythAVCopy m_copy; QScopedPointer m_deinterlacer; - float m_fps {0.0f}; + float m_fps {0.0F}; unsigned char *m_outputbuf {nullptr}; QString m_frameFile; int m_frameWidth { 0}; diff --git a/mythplugins/mythgallery/mythgallery/glsingleview.cpp b/mythplugins/mythgallery/mythgallery/glsingleview.cpp index d59acca2a54..69dd0d28947 100644 --- a/mythplugins/mythgallery/mythgallery/glsingleview.cpp +++ b/mythplugins/mythgallery/mythgallery/glsingleview.cpp @@ -1043,7 +1043,7 @@ void GLSingleView::EffectCube(void) glMatrixMode(GL_PROJECTION); glLoadIdentity(); -// float PI = 4.0f * atan(1.0F); +// float PI = 4.0F * atan(1.0F); float const znear = 3.0F; // float theta = 2.0F * atan2(2.0F / 2.0F, znear); // theta = theta * 180.0F/PI; diff --git a/mythplugins/mythgallery/mythgallery/glsingleview.h b/mythplugins/mythgallery/mythgallery/glsingleview.h index 93cfe22baa6..ec6cfb88f18 100644 --- a/mythplugins/mythgallery/mythgallery/glsingleview.h +++ b/mythplugins/mythgallery/mythgallery/glsingleview.h @@ -118,8 +118,8 @@ class GLSingleView : public QGLWidget, public ImageView private: // General - float m_source_x {0.0f}; - float m_source_y {0.0f}; + float m_source_x {0.0F}; + float m_source_y {0.0F}; ScaleMax m_scaleMax {kScaleToFit}; // Texture variables (for display and effects) @@ -136,18 +136,18 @@ class GLSingleView : public QGLWidget, public ImageView int m_effect_rotate_direction {0}; MythTimer m_effect_frame_time; int m_effect_transition_timeout {2000}; - float m_effect_transition_timeout_inv {1.0f / 2000}; + float m_effect_transition_timeout_inv {1.0F / 2000}; // Unshared effect state variables float m_effect_flutter_points[40][40][3]; - float m_effect_cube_xrot {0.0f}; - float m_effect_cube_yrot {0.0f}; - float m_effect_cube_zrot {0.0f}; + float m_effect_cube_xrot {0.0F}; + float m_effect_cube_yrot {0.0F}; + float m_effect_cube_zrot {0.0F}; float m_effect_kenBurns_location_x[2]; float m_effect_kenBurns_location_y[2]; int m_effect_kenBurns_projection[2]; MythTimer m_effect_kenBurns_image_time[2]; - float m_effect_kenBurns_image_timeout {0.0f}; + float m_effect_kenBurns_image_timeout {0.0F}; KenBurnsImageLoader *m_effect_kenBurns_imageLoadThread {nullptr}; bool m_effect_kenBurns_image_ready {true}; QImage m_effect_kenBurns_image; diff --git a/mythplugins/mythgallery/mythgallery/gltexture.h b/mythplugins/mythgallery/mythgallery/gltexture.h index 90829c5af39..5425658a4ac 100644 --- a/mythplugins/mythgallery/mythgallery/gltexture.h +++ b/mythplugins/mythgallery/mythgallery/gltexture.h @@ -42,7 +42,7 @@ class GLTexture void Deinit(void); void Bind(void); - void MakeQuad(float alpha = 1.0f, float scale = 1.0f); + void MakeQuad(float alpha = 1.0F, float scale = 1.0F); void SwapWidthHeight(void) { int tmp = width; width = height; height = tmp; } @@ -69,8 +69,8 @@ class GLTexture ThumbItem *item {nullptr}; int width {512}; int height {512}; - float cx {1.0f}; - float cy {1.0f}; + float cx {1.0F}; + float cy {1.0F}; }; #endif // USING_OPENGL diff --git a/mythplugins/mythgallery/mythgallery/imageview.h b/mythplugins/mythgallery/mythgallery/imageview.h index 4a153b8ea28..f33d64a54d9 100644 --- a/mythplugins/mythgallery/mythgallery/imageview.h +++ b/mythplugins/mythgallery/mythgallery/imageview.h @@ -91,12 +91,12 @@ class ImageView protected: QSize m_screenSize {640,480}; - float m_wmult {1.0f}; - float m_hmult {1.0f}; + float m_wmult {1.0F}; + float m_hmult {1.0F}; int m_pos; int *m_savedPos {nullptr}; int m_movieState {0}; - float m_zoom {1.0f}; + float m_zoom {1.0F}; bool m_info_show {false}; bool m_info_show_short {false}; diff --git a/mythplugins/mythgallery/mythgallery/mythdialogs.h b/mythplugins/mythgallery/mythgallery/mythdialogs.h index 6c05e881100..04048d594d1 100644 --- a/mythplugins/mythgallery/mythgallery/mythdialogs.h +++ b/mythplugins/mythgallery/mythgallery/mythdialogs.h @@ -87,8 +87,8 @@ class MPUBLIC MythDialog : public QFrame void keyPressEvent(QKeyEvent *e) override; // QWidget - float m_dlgwmult {0.0f}; - float m_dlghmult {0.0f}; + float m_dlgwmult {0.0F}; + float m_dlghmult {0.0F}; int m_screenwidth {0}; int m_screenheight {0}; int m_xbase {0}; diff --git a/mythplugins/mythgallery/mythgallery/singleview.h b/mythplugins/mythgallery/mythgallery/singleview.h index 63ae79acc65..fe13e7d6157 100644 --- a/mythplugins/mythgallery/mythgallery/singleview.h +++ b/mythplugins/mythgallery/mythgallery/singleview.h @@ -130,15 +130,15 @@ class SingleView : public MythDialog, public ImageView int m_effect_i {0}; ///< misc effects iterator int m_effect_j {0}; ///< misc effects iterator int m_effect_framerate {0}; ///< timeout between effects - float m_effect_delta2_x {0.0f}; - float m_effect_delta2_y {0.0f}; - float m_effect_alpha {0.0f}; + float m_effect_delta2_x {0.0F}; + float m_effect_delta2_y {0.0F}; + float m_effect_alpha {0.0F}; // Unshared effect state variables QPoint m_effect_spiral_tmp0 {0,0}; QPoint m_effect_spiral_tmp1 {0,0}; vector m_effect_meltdown_y_disp; - float m_effect_multi_circle_out_delta_alpha {0.0f}; + float m_effect_multi_circle_out_delta_alpha {0.0F}; QPolygon m_effect_milti_circle_out_points {4}; QPolygon m_effect_circle_out_points {4}; }; diff --git a/mythplugins/mythmusic/mythmusic/inlines.h b/mythplugins/mythmusic/mythmusic/inlines.h index f913c40a7f3..d7f9b624e50 100644 --- a/mythplugins/mythmusic/mythmusic/inlines.h +++ b/mythplugins/mythmusic/mythmusic/inlines.h @@ -16,7 +16,7 @@ static inline void stereo16_from_stereopcm8(short *l, uchar *c, long cnt) { - while (cnt >= 4l) { + while (cnt >= 4L) { l[0] = c[0]; r[0] = c[1]; l[1] = c[2]; @@ -28,16 +28,16 @@ static inline void stereo16_from_stereopcm8(short *l, l += 4; r += 4; c += 8; - cnt -= 4l; + cnt -= 4L; } - if (cnt > 0l) { + if (cnt > 0L) { l[0] = c[0]; r[0] = c[1]; - if (cnt > 1l) { + if (cnt > 1L) { l[1] = c[2]; r[1] = c[3]; - if (cnt > 2l) { + if (cnt > 2L) { l[2] = c[4]; r[2] = c[5]; } @@ -51,7 +51,7 @@ static inline void stereo16_from_stereopcm16(short *l, short *s, long cnt) { - while (cnt >= 4l) { + while (cnt >= 4L) { l[0] = s[0]; r[0] = s[1]; l[1] = s[2]; @@ -63,16 +63,16 @@ static inline void stereo16_from_stereopcm16(short *l, l += 4; r += 4; s += 8; - cnt -= 4l; + cnt -= 4L; } - if (cnt > 0l) { + if (cnt > 0L) { l[0] = s[0]; r[0] = s[1]; - if (cnt > 1l) { + if (cnt > 1L) { l[1] = s[2]; r[1] = s[3]; - if (cnt > 2l) { + if (cnt > 2L) { l[2] = s[4]; r[2] = s[5]; } @@ -99,8 +99,8 @@ static inline void stereo16_from_stereopcmfloat(short *l, long cnt) { while (cnt--) { - *l++ = (short)(*s++ * 32767.0f); - *r++ = (short)(*s++ * 32767.0f); + *l++ = (short)(*s++ * 32767.0F); + *r++ = (short)(*s++ * 32767.0F); } } @@ -109,21 +109,21 @@ static inline void mono16_from_monopcm8(short *l, uchar *c, long cnt) { - while (cnt >= 4l) { + while (cnt >= 4L) { l[0] = c[0]; l[1] = c[1]; l[2] = c[2]; l[3] = c[3]; l += 4; c += 4; - cnt -= 4l; + cnt -= 4L; } - if (cnt > 0l) { + if (cnt > 0L) { l[0] = c[0]; - if (cnt > 1l) { + if (cnt > 1L) { l[1] = c[1]; - if (cnt > 2l) { + if (cnt > 2L) { l[2] = c[2]; } } @@ -135,21 +135,21 @@ static inline void mono16_from_monopcm16(short *l, short *s, long cnt) { - while (cnt >= 4l) { + while (cnt >= 4L) { l[0] = s[0]; l[1] = s[1]; l[2] = s[2]; l[3] = s[3]; l += 4; s += 4; - cnt -= 4l; + cnt -= 4L; } - if (cnt > 0l) { + if (cnt > 0L) { l[0] = s[0]; - if (cnt > 1l) { + if (cnt > 1L) { l[1] = s[1]; - if (cnt > 2l) { + if (cnt > 2L) { l[2] = s[2]; } } @@ -171,7 +171,7 @@ static inline void mono16_from_monopcmfloat(short *l, long cnt) { while (cnt--) - *l++ = (short)(*s++ * 32767.0f); + *l++ = (short)(*s++ * 32767.0F); } @@ -180,20 +180,20 @@ static inline void fast_short_set(short *p, short v, long c) { - while (c >= 4l) { + while (c >= 4L) { p[0] = v; p[1] = v; p[2] = v; p[3] = v; p += 4; - c -= 4l; + c -= 4L; } - if (c > 0l) { + if (c > 0L) { p[0] = v; - if (c > 1l) { + if (c > 1L) { p[1] = v; - if (c > 2l) { + if (c > 2L) { p[2] = v; } } @@ -205,21 +205,21 @@ static inline void fast_real_set_from_short(fftw_real *d, short *s, long c) { - while (c >= 4l) { + while (c >= 4L) { d[0] = fftw_real(s[0]); d[1] = fftw_real(s[1]); d[2] = fftw_real(s[2]); d[3] = fftw_real(s[3]); d += 4; s += 4; - c -= 4l; + c -= 4L; } - if (c > 0l) { + if (c > 0L) { d[0] = fftw_real(s[0]); - if (c > 1l) { + if (c > 1L) { d[1] = fftw_real(s[1]); - if (c > 2l) { + if (c > 2L) { d[2] = fftw_real(s[2]); } } @@ -231,7 +231,7 @@ static inline void fast_reals_set(fftw_real *p1, fftw_real v, long c) { - while (c >= 4l) { + while (c >= 4L) { p1[0] = v; p1[1] = v; p1[2] = v; @@ -242,16 +242,16 @@ static inline void fast_reals_set(fftw_real *p1, p2[3] = v; p1 += 4; p2 += 4; - c -= 4l; + c -= 4L; } - if (c > 0l) { + if (c > 0L) { p1[0] = v; p2[0] = v; - if (c > 1l) { + if (c > 1L) { p1[1] = v; p2[1] = v; - if (c > 2l) { + if (c > 2L) { p1[2] = v; p2[2] = v; } diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.h b/mythplugins/mythmusic/mythmusic/musicplayer.h index 75f8e2d9f2f..d7574735876 100644 --- a/mythplugins/mythmusic/mythmusic/musicplayer.h +++ b/mythplugins/mythmusic/mythmusic/musicplayer.h @@ -236,7 +236,7 @@ class MusicPlayer : public QObject, public MythObservable ResumeMode m_resumeModeEditor {RESUME_OFF}; ResumeMode m_resumeModeRadio {RESUME_TRACK}; - float m_playSpeed {1.0f}; + float m_playSpeed {1.0F}; // notification bool m_showScannerNotifications {true}; diff --git a/mythplugins/mythmusic/mythmusic/visualize.cpp b/mythplugins/mythmusic/mythmusic/visualize.cpp index 00a84d95303..d82c7a934c8 100644 --- a/mythplugins/mythmusic/mythmusic/visualize.cpp +++ b/mythplugins/mythmusic/mythmusic/visualize.cpp @@ -1139,7 +1139,7 @@ bool Piano::process_all_types(VisualNode *node, bool /*this_will_be_displayed*/) #if 0 // Take logs everywhere, and shift up to [0, ??] - if(magnitude_av > 0.0f) + if(magnitude_av > 0.0F) { magnitude_av = log(magnitude_av); } @@ -1149,7 +1149,7 @@ bool Piano::process_all_types(VisualNode *node, bool /*this_will_be_displayed*/) } magnitude_av -= PIANO_MIN_VOL; - if (magnitude_av < 0.0f) + if (magnitude_av < 0.0F) { magnitude_av = 0.0; } diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp index f40ea4288a1..f47e275b90f 100644 --- a/mythtv/libs/libmyth/audio/audiooutputca.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputca.cpp @@ -440,7 +440,7 @@ int AudioOutputCA::GetVolumeChannel(int channel) const if (!AudioUnitGetParameter(d->mOutputUnit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, &volume)) - return (int)lroundf(volume * 100.0f); + return (int)lroundf(volume * 100.0F); return 0; // error case } @@ -450,7 +450,7 @@ void AudioOutputCA::SetVolumeChannel(int channel, int volume) // FIXME: this only sets global volume (void)channel; AudioUnitSetParameter(d->mOutputUnit, kHALOutputParam_Volume, - kAudioUnitScope_Global, 0, (volume * 0.01f), 0); + kAudioUnitScope_Global, 0, (volume * 0.01F), 0); } // IOProc style callback for SPDIF audio output diff --git a/mythtv/libs/libmyth/audio/audiooutputdx.cpp b/mythtv/libs/libmyth/audio/audiooutputdx.cpp index b1b237e22ac..26b2473e5f4 100644 --- a/mythtv/libs/libmyth/audio/audiooutputdx.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputdx.cpp @@ -601,7 +601,7 @@ void AudioOutputDX::SetVolumeChannel(int channel, int volume) { HRESULT dsresult; float dbAtten = 20 * log10((float)volume/100); - long dxVolume = (volume == 0) ? DSBVOLUME_MIN : (long)(100.0f * dbAtten); + long dxVolume = (volume == 0) ? DSBVOLUME_MIN : (long)(100.0F * dbAtten); if (m_UseSPDIF) return; diff --git a/mythtv/libs/libmyth/audio/audiooutputopensles.cpp b/mythtv/libs/libmyth/audio/audiooutputopensles.cpp index 09852c29ffe..422f16d467e 100644 --- a/mythtv/libs/libmyth/audio/audiooutputopensles.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputopensles.cpp @@ -490,7 +490,7 @@ int AudioOutputOpenSLES::GetVolumeChannel(int channel) const } else { - volume = lroundf(expf(mb / (3*2000.0f)) * 100); + volume = lroundf(expf(mb / (3*2000.0F)) * 100); } VBAUDIO(QString("GetVolume(%1) %2 (%3)") .arg(channel).arg(volume).arg(mb)); @@ -522,7 +522,7 @@ void AudioOutputOpenSLES::SetVolumeChannel(int channel, int volume) else { // millibels from linear amplification - mb = lroundf(3 * 2000.f * log10f(vol)); + mb = lroundf(3 * 2000.F * log10f(vol)); if (mb < SL_MILLIBEL_MIN) mb = SL_MILLIBEL_MIN; else if (mb > 0) diff --git a/mythtv/libs/libmyth/mediamonitor-darwin.cpp b/mythtv/libs/libmyth/mediamonitor-darwin.cpp index 8ceb61ca873..a382afa7e06 100644 --- a/mythtv/libs/libmyth/mediamonitor-darwin.cpp +++ b/mythtv/libs/libmyth/mediamonitor-darwin.cpp @@ -390,7 +390,7 @@ void MonitorThreadDarwin::run(void) // Run the run loop for interval (milliseconds) - this will // handle any disk arbitration appeared/dissappeared events CFRunLoopRunInMode(kCFRunLoopDefaultMode, - (float) m_Interval / 1000.0f, false ); + (float) m_Interval / 1000.0F, false ); } DAUnregisterCallback(daSession, (void(*))diskChangedCallback, this); diff --git a/mythtv/libs/libmyth/programinfo.h b/mythtv/libs/libmyth/programinfo.h index b9a085c9a32..273f8e29a5a 100644 --- a/mythtv/libs/libmyth/programinfo.h +++ b/mythtv/libs/libmyth/programinfo.h @@ -433,7 +433,7 @@ class MPUBLIC ProgramInfo int GetRecordingPriority2(void) const { return m_recpriority2; } float GetStars(void) const { return m_stars; } uint GetStars(uint range_max) const - { return (int)(m_stars * range_max + 0.5f); } + { return (int)(m_stars * range_max + 0.5F); } uint GetRecordingID(void) const { return m_recordedid; } RecStatus::Type GetRecordingStatus(void) const @@ -773,7 +773,7 @@ class MPUBLIC ProgramInfo QDateTime m_recstartts {m_startts}; QDateTime m_recendts {m_startts}; - float m_stars {0.0f}; ///< Rating, range [0..1] + float m_stars {0.0F}; ///< Rating, range [0..1] QDate m_originalAirDate; QDateTime m_lastmodified {m_startts}; QDateTime m_lastInUseTime {m_startts.addSecs(-4 * 60 * 60)}; diff --git a/mythtv/libs/libmyth/test/test_audioutils/test_audioutils.h b/mythtv/libs/libmyth/test/test_audioutils/test_audioutils.h index dba4438bd4c..517b3fea393 100644 --- a/mythtv/libs/libmyth/test/test_audioutils/test_audioutils.h +++ b/mythtv/libs/libmyth/test/test_audioutils/test_audioutils.h @@ -73,8 +73,8 @@ class TestAudioUtils: public QObject { QCOMPARE(arrays1[i], arrays2[i]); // test that it's bound between -1 and 1 - QVERIFY(arrayf[i] >= -1.0f); - QVERIFY(arrayf[i] <= 1.0f); + QVERIFY(arrayf[i] >= -1.0F); + QVERIFY(arrayf[i] <= 1.0F); } av_free(arrays1); av_free(arrays2); @@ -118,8 +118,8 @@ class TestAudioUtils: public QObject { QCOMPARE(arrays1[i+offsetshort], arrays2[i+offsetshort]); // test that it's bound between -1 and 1 - QVERIFY(arrayf[i+offsetfloat] >= -1.0f); - QVERIFY(arrayf[i+offsetfloat] <= 1.0f); + QVERIFY(arrayf[i+offsetfloat] >= -1.0F); + QVERIFY(arrayf[i+offsetfloat] <= 1.0F); } av_free(arrays1); @@ -163,10 +163,10 @@ class TestAudioUtils: public QObject QCOMPARE(arrays1[i+offsetshort], arrays2[i]); QCOMPARE(arrayf1[i+offsetfloat], arrayf2[i]); // test that it's bound between -1 and 1 - QVERIFY(arrayf1[i+offsetfloat] >= -1.0f); - QVERIFY(arrayf1[i+offsetfloat] <= 1.0f); - QVERIFY(arrayf2[i] >= -1.0f); - QVERIFY(arrayf2[i] <= 1.0f); + QVERIFY(arrayf1[i+offsetfloat] >= -1.0F); + QVERIFY(arrayf1[i+offsetfloat] <= 1.0F); + QVERIFY(arrayf2[i] >= -1.0F); + QVERIFY(arrayf2[i] <= 1.0F); } av_free(arrays1); @@ -399,8 +399,8 @@ class TestAudioUtils: public QObject { QCOMPARE(arrays1[i], arrays2[i]); // test that it's bound between -1 and 1 - QVERIFY(arrayf[i] >= -1.0f); - QVERIFY(arrayf[i] <= 1.0f); + QVERIFY(arrayf[i] >= -1.0F); + QVERIFY(arrayf[i] <= 1.0F); } av_free(arrays1); av_free(arrays2); @@ -433,8 +433,8 @@ class TestAudioUtils: public QObject { QCOMPARE(arrays1[i+1], arrays2[i+1]); // test that it's bound between -1 and 1 - QVERIFY(arrayf[i+1] >= -1.0f); - QVERIFY(arrayf[i+1] <= 1.0f); + QVERIFY(arrayf[i+1] >= -1.0F); + QVERIFY(arrayf[i+1] <= 1.0F); } av_free(arrays1); @@ -478,8 +478,8 @@ class TestAudioUtils: public QObject QCOMPARE(arrays1[i+offsetuchar], arrays2[i]); QCOMPARE(arrayf1[i+offsetfloat], arrayf2[i]); // test that it's bound between -1 and 1 - QVERIFY(arrayf1[i+offsetfloat] >= -1.0f); - QVERIFY(arrayf1[i+offsetfloat] <= 1.0f); + QVERIFY(arrayf1[i+offsetfloat] >= -1.0F); + QVERIFY(arrayf1[i+offsetfloat] <= 1.0F); } av_free(arrays1); @@ -658,8 +658,8 @@ class TestAudioUtils: public QObject QCOMPARE(arrays1[i+offsetint32_t], arrays2[i]); QCOMPARE(arrayf1[i+offsetfloat1], arrayf2[i]+offsetfloat2); // test that it's bound between -1 and 1 - QVERIFY(arrayf1[i+offsetfloat1] >= -1.0f); - QVERIFY(arrayf1[i+offsetfloat1] <= 1.0f); + QVERIFY(arrayf1[i+offsetfloat1] >= -1.0F); + QVERIFY(arrayf1[i+offsetfloat1] <= 1.0F); } av_free(arrays1); @@ -893,8 +893,8 @@ class TestAudioUtils: public QObject for (int i = 0; i < 8; i++) { QCOMPARE(arrayf2[i], arrayf3[i]); - QVERIFY(arrayf2[i] >= -1.0f); - QVERIFY(arrayf2[i] <= 1.0f); + QVERIFY(arrayf2[i] >= -1.0F); + QVERIFY(arrayf2[i] <= 1.0F); } // test all float array are properly clipped @@ -908,8 +908,8 @@ class TestAudioUtils: public QObject // sanity check QCOMPARE(arrayf1[i+offsetfloat1], arrayf2[i+offsetfloat2]); // test that it's bound between -1 and 1 - QVERIFY(arrayf1[i+offsetfloat1] >= -1.0f); - QVERIFY(arrayf1[i+offsetfloat1] <= 1.0f); + QVERIFY(arrayf1[i+offsetfloat1] >= -1.0F); + QVERIFY(arrayf1[i+offsetfloat1] <= 1.0F); } av_free(arrayf1); diff --git a/mythtv/libs/libmyth/test/test_programinfo/test_programinfo.h b/mythtv/libs/libmyth/test/test_programinfo/test_programinfo.h index e8288ecb3cf..982b137cb7d 100644 --- a/mythtv/libs/libmyth/test/test_programinfo/test_programinfo.h +++ b/mythtv/libs/libmyth/test/test_programinfo/test_programinfo.h @@ -70,7 +70,7 @@ class TestProgramInfo : public QObject MythDate::fromString ("2000-01-01 00:00:00"), /* rec start ts */ MythDate::fromString ("2000-01-01 01:30:00"), /* rec end ts */ - 0.0f, /* stars */ + 0.0F, /* stars */ year, /* year */ (uint) 0, /* part number */ diff --git a/mythtv/libs/libmythbase/mythmiscutil.h b/mythtv/libs/libmythbase/mythmiscutil.h index c79046ed410..485fb647a8a 100644 --- a/mythtv/libs/libmythbase/mythmiscutil.h +++ b/mythtv/libs/libmythbase/mythmiscutil.h @@ -48,7 +48,7 @@ inline int clamp(int val, int minimum, int maximum) } inline float lerp(float r, float a, float b) { - return ((1.0f - r) * a) + (r * b); + return ((1.0F - r) * a) + (r * b); } inline int lerp(float r, int a, int b) { diff --git a/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp index ffbf17e54d0..a0c71f82626 100644 --- a/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp +++ b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp @@ -817,7 +817,7 @@ void MythAirplayServer::HandleResponse(APHTTPRequest *req, .arg(position).arg(duration)); /* - if (playing && playerspeed < 1.0f) + if (playing && playerspeed < 1.0F) { SendReverseEvent(session, AP_EVENT_PLAYING); QKeyEvent* ke = new QKeyEvent(QEvent::KeyPress, 0, diff --git a/mythtv/libs/libmythtv/audioplayer.h b/mythtv/libs/libmythtv/audioplayer.h index 66bbcc529c5..4c625b39ef5 100644 --- a/mythtv/libs/libmythtv/audioplayer.h +++ b/mythtv/libs/libmythtv/audioplayer.h @@ -117,7 +117,7 @@ class MTV_PUBLIC AudioPlayer AudioFormat m_format {FORMAT_NONE}; int m_samplerate {44100}; int m_codec_profile {0}; - float m_stretchfactor {1.0f}; + float m_stretchfactor {1.0F}; bool m_passthru {false}; QMutex m_lock {QMutex::Recursive}; bool m_muted_on_creation; diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp index 111b4be0a99..50458d28710 100644 --- a/mythtv/libs/libmythtv/avformatdecoder.cpp +++ b/mythtv/libs/libmythtv/avformatdecoder.cpp @@ -3382,7 +3382,7 @@ void AvFormatDecoder::HandleGopStart( { long long index = m_positionMap.back().index; long long totframes = index * m_keyframedist; - uint length = (uint)((totframes * 1.0f) / m_fps); + uint length = (uint)((totframes * 1.0F) / m_fps); m_parent->SetFileLength(length, totframes); } #endif diff --git a/mythtv/libs/libmythtv/avformatdecoder.h b/mythtv/libs/libmythtv/avformatdecoder.h index 969521fe399..3f249cbd389 100644 --- a/mythtv/libs/libmythtv/avformatdecoder.h +++ b/mythtv/libs/libmythtv/avformatdecoder.h @@ -377,7 +377,7 @@ class AvFormatDecoder : public DecoderBase AudioInfo m_audioIn; AudioInfo m_audioOut; - float m_fps {0.0f}; + float m_fps {0.0F}; bool m_codec_is_mpeg {false}; bool m_processFrames {true}; bool m_streams_changed {false}; diff --git a/mythtv/libs/libmythtv/deletemap.h b/mythtv/libs/libmythtv/deletemap.h index d77f26c8315..a5dc60648b4 100644 --- a/mythtv/libs/libmythtv/deletemap.h +++ b/mythtv/libs/libmythtv/deletemap.h @@ -105,7 +105,7 @@ class MTV_PUBLIC DeleteMap QString m_seekText; bool m_changed {true}; int m_seekamountpos {4}; - float m_seekamount {1.0f}; + float m_seekamount {1.0F}; PlayerContext *m_ctx {nullptr}; uint64_t m_cachedTotalForOSD {0}; diff --git a/mythtv/libs/libmythtv/eitfixup.h b/mythtv/libs/libmythtv/eitfixup.h index 000b328461c..f1d8e016633 100644 --- a/mythtv/libs/libmythtv/eitfixup.h +++ b/mythtv/libs/libmythtv/eitfixup.h @@ -56,9 +56,9 @@ class EITFixUp kFixAUSeven = 1 << 21, kFixP7S1 = 1 << 26, kFixHTML = 1 << 27, - kFixUnitymedia = 1ull << 32, - kFixATV = 1ull << 33, - kFixDisneyChannel = 1ull << 34, + kFixUnitymedia = 1ULL << 32, + kFixATV = 1ULL << 33, + kFixDisneyChannel = 1ULL << 34, // Early fixups kEFixForceISO8859_1 = 1 << 22, @@ -69,7 +69,7 @@ class EITFixUp kFixGreekSubtitle = 1 << 29, kFixGreekEIT = 1 << 30, - kFixGreekCategories = 1u << 31, + kFixGreekCategories = 1U << 31, }; EITFixUp(); diff --git a/mythtv/libs/libmythtv/mythavutil.h b/mythtv/libs/libmythtv/mythavutil.h index 1cf2f94502e..e8872ca15a4 100644 --- a/mythtv/libs/libmythtv/mythavutil.h +++ b/mythtv/libs/libmythtv/mythavutil.h @@ -168,7 +168,7 @@ MTV_PUBLIC VideoFrameType PixelFormatToFrameType(AVPixelFormat fmt); class MTV_PUBLIC MythPictureDeinterlacer { public: - MythPictureDeinterlacer(AVPixelFormat pixfmt, int width, int height, float ar = 1.0f); + MythPictureDeinterlacer(AVPixelFormat pixfmt, int width, int height, float ar = 1.0F); ~MythPictureDeinterlacer(); // Will deinterlace src into dst. If EAGAIN is returned, more frames // are needed to output a frame. diff --git a/mythtv/libs/libmythtv/mythframe.h b/mythtv/libs/libmythtv/mythframe.h index 59575824478..d8274134750 100644 --- a/mythtv/libs/libmythtv/mythframe.h +++ b/mythtv/libs/libmythtv/mythframe.h @@ -99,7 +99,7 @@ static inline void init(VideoFrame *vf, VideoFrameType _codec, unsigned char *_buf, int _width, int _height, int _size, const int *p = nullptr, const int *o = nullptr, - float _aspect = -1.0f, double _rate = -1.0f, + float _aspect = -1.0F, double _rate = -1.0F, int _aligned = 64); static inline void clear(VideoFrame *vf); static inline bool compatible(const VideoFrame *a, diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp index 4770b7d6a33..b2845043611 100644 --- a/mythtv/libs/libmythtv/mythplayer.cpp +++ b/mythtv/libs/libmythtv/mythplayer.cpp @@ -5385,8 +5385,8 @@ uint64_t MythPlayer::GetCurrentFrameCount(void) const } // Finds the frame number associated with the given time offset. A -// positive offset or +0.0f indicate offset from the beginning. A -// negative offset or -0.0f indicate offset from the end. Limit the +// positive offset or +0.0F indicate offset from the beginning. A +// negative offset or -0.0F indicate offset from the end. Limit the // result to within bounds of the video. uint64_t MythPlayer::FindFrame(float offset, bool use_cutlist) const { diff --git a/mythtv/libs/libmythtv/playercontext.h b/mythtv/libs/libmythtv/playercontext.h index f6e593249b6..8e983cbacd2 100644 --- a/mythtv/libs/libmythtv/playercontext.h +++ b/mythtv/libs/libmythtv/playercontext.h @@ -177,14 +177,14 @@ class MTV_PUBLIC PlayerContext int m_fftime {0}; int m_rewtime {0}; int m_jumptime {0}; - /** \brief Time stretch speed, 1.0f for normal playback. + /** \brief Time stretch speed, 1.0F for normal playback. * - * Begins at 1.0f meaning normal playback, but can be increased + * Begins at 1.0F meaning normal playback, but can be increased * or decreased to speedup or slowdown playback. * Ignored when doing Fast Forward or Rewind. */ - float m_tsNormal {1.0f}; - float m_tsAlt {1.5f}; + float m_tsNormal {1.0F}; + float m_tsAlt {1.5F}; mutable QMutex m_playingInfoLock {QMutex::Recursive}; mutable QMutex m_deletePlayerLock {QMutex::Recursive}; diff --git a/mythtv/libs/libmythtv/privatedecoder_vda.cpp b/mythtv/libs/libmythtv/privatedecoder_vda.cpp index cc39e551322..dff43f86173 100644 --- a/mythtv/libs/libmythtv/privatedecoder_vda.cpp +++ b/mythtv/libs/libmythtv/privatedecoder_vda.cpp @@ -439,7 +439,7 @@ bool PrivateDecoderVDA::Init(const QString &decoder, m_size = QSize(width, height); m_slice_count = avctx->slice_count; - int mbs = ceil((double)width / 16.0f); + int mbs = ceil((double)width / 16.0F); if (((mbs == 49) || (mbs == 54 ) || (mbs == 59 ) || (mbs == 64) || (mbs == 113) || (mbs == 118) || (mbs == 123) || (mbs == 128))) { diff --git a/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.h b/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.h index 1595a6ef5db..bd012b35187 100644 --- a/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.h +++ b/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.h @@ -181,7 +181,7 @@ class MTV_PUBLIC NuppelVideoRecorder : public V4LRecorder, public CC608Input int m_effectivedsp {0}; // actual measured rate int m_usebttv {1}; - float m_video_aspect {1.33333f}; + float m_video_aspect {1.33333F}; bool m_transcoding {false}; diff --git a/mythtv/libs/libmythtv/ringbuffer.h b/mythtv/libs/libmythtv/ringbuffer.h index 278ed427d7e..9ad492bdff7 100644 --- a/mythtv/libs/libmythtv/ringbuffer.h +++ b/mythtv/libs/libmythtv/ringbuffer.h @@ -266,7 +266,7 @@ class MTV_PUBLIC RingBuffer : protected MThread volatile bool m_recentSeek {true}; // not protected by rwLock bool m_setSwitchToNext {false}; uint m_rawBitrate {8000}; - float m_playSpeed {1.0f}; + float m_playSpeed {1.0F}; int m_fillThreshold {65536}; int m_fillMin {-1}; int m_readBlockSize {CHUNK}; diff --git a/mythtv/libs/libmythtv/subtitlescreen.h b/mythtv/libs/libmythtv/subtitlescreen.h index 5bc7e8e8f78..3d960b67ee3 100644 --- a/mythtv/libs/libmythtv/subtitlescreen.h +++ b/mythtv/libs/libmythtv/subtitlescreen.h @@ -35,7 +35,7 @@ class FormattedTextChunk : m_text(t), m_format(formatting), m_parent(p) {} FormattedTextChunk(void) = default; - QSize CalcSize(float layoutSpacing = 0.0f) const; + QSize CalcSize(float layoutSpacing = 0.0F) const; void CalcPadding(bool isFirst, bool isLast, int &left, int &right) const; bool Split(FormattedTextChunk &newChunk); QString ToLogString(void) const; @@ -59,7 +59,7 @@ class FormattedTextLine FormattedTextLine(int x = -1, int y = -1, int o_x = -1, int o_y = -1) : m_xIndent(x), m_yIndent(y), m_origX(o_x), m_origY(o_y) {} - QSize CalcSize(float layoutSpacing = 0.0f) const; + QSize CalcSize(float layoutSpacing = 0.0F) const; QList chunks; int m_xIndent {-1}; // -1 means TBD i.e. centered diff --git a/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp b/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp index afefb8abc9d..076f41c7ec9 100644 --- a/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp +++ b/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.cpp @@ -815,7 +815,7 @@ void TestEITFixups::test64BitEnum(void) // did kFixGreekCategories = 1<<31 cause issues? #if 0 - QCOMPARE(QString::number(1<<31, 16), QString::number(1u<<31, 16)); + QCOMPARE(QString::number(1<<31, 16), QString::number(1U<<31, 16)); #endif // two different flags, fixed version QVERIFY(!(1ULL<<31 & 1ULL<<32)); diff --git a/mythtv/libs/libmythtv/tv_play.h b/mythtv/libs/libmythtv/tv_play.h index 54322ddd277..708eb0d8b01 100644 --- a/mythtv/libs/libmythtv/tv_play.h +++ b/mythtv/libs/libmythtv/tv_play.h @@ -796,7 +796,7 @@ class MTV_PUBLIC TV : public QObject, public MenuItemDisplayer bool m_tryUnflaggedSkip {false}; bool m_smartForward {false}; - float m_ffRewRepos {1.0f}; + float m_ffRewRepos {1.0F}; bool m_ffRewReverse {false}; vector m_ffRewSpeeds; diff --git a/mythtv/libs/libmythtv/vbi608extractor.h b/mythtv/libs/libmythtv/vbi608extractor.h index ea9166ffb32..10774103e77 100644 --- a/mythtv/libs/libmythtv/vbi608extractor.h +++ b/mythtv/libs/libmythtv/vbi608extractor.h @@ -49,8 +49,8 @@ class VBI608Extractor QList m_rawMaximas; QList m_maximas; QList m_minimas; - float m_start {0.0f}; - float m_rate {0.0f}; + float m_start {0.0F}; + float m_rate {0.0F}; uint16_t m_code[2]; }; diff --git a/mythtv/libs/libmythtv/videoouttypes.h b/mythtv/libs/libmythtv/videoouttypes.h index 5f8dbca1a0c..553ec4eeff4 100644 --- a/mythtv/libs/libmythtv/videoouttypes.h +++ b/mythtv/libs/libmythtv/videoouttypes.h @@ -250,10 +250,10 @@ inline float get_aspect_override(AspectOverrideMode aspectmode, float orig) float ret = orig; switch (aspectmode) { - case kAspect_4_3: ret = 4.0f / 3.0f; break; - case kAspect_14_9: ret = 14.0f / 9.0f; break; - case kAspect_16_9: ret = 16.0f / 9.0f; break; - case kAspect_2_35_1: ret = 2.35f ; break; + case kAspect_4_3: ret = 4.0F / 3.0F; break; + case kAspect_14_9: ret = 14.0F / 9.0F; break; + case kAspect_16_9: ret = 16.0F / 9.0F; break; + case kAspect_2_35_1: ret = 2.35F ; break; case kAspect_Toggle: case kAspect_Off: case kAspect_END: break; diff --git a/mythtv/libs/libmythtv/visualisations/goom/goom_core.c b/mythtv/libs/libmythtv/visualisations/goom/goom_core.c index cb8f66ca148..4175b97323b 100644 --- a/mythtv/libs/libmythtv/visualisations/goom/goom_core.c +++ b/mythtv/libs/libmythtv/visualisations/goom/goom_core.c @@ -165,7 +165,7 @@ guint32 * goom_update (gint16 data[2][512], int forceMode) { static int decay_ifs = 0; // disparition de l'ifs static int recay_ifs = 0; // dédisparition de l'ifs -#define SWITCHMULT (29.0f/30.0f) +#define SWITCHMULT (29.0F/30.0F) #define SWITCHINCR 0x7f static float switchMult = 1.0F; static int switchIncr = SWITCHINCR; @@ -674,7 +674,7 @@ guint32 * goom_update (gint16 data[2][512], int forceMode) { for (i=0;i0) { for (i=0;i 0) { - val = (int) t; // (32.0f * log (t)); + val = (int) t; // (32.0F * log (t)); if (val > 255) val = 255; if (val < 0) diff --git a/mythtv/libs/libmythtv/visualisations/goom/tentacle3d.c b/mythtv/libs/libmythtv/visualisations/goom/tentacle3d.c index f4d2d10b694..bf0b3c92942 100644 --- a/mythtv/libs/libmythtv/visualisations/goom/tentacle3d.c +++ b/mythtv/libs/libmythtv/visualisations/goom/tentacle3d.c @@ -5,7 +5,7 @@ #include "goom_tools.h" #include "goomconfig.h" -#define D 256.0f +#define D 256.0F #define nbgrid 6 #define definitionx 15 @@ -51,7 +51,7 @@ lighten (unsigned char value, float power) float t = (float) val * log10f(power) / 2.0F; if (t > 0) { - val = (int) t; // (32.0f * log (t)); + val = (int) t; // (32.0F * log (t)); if (val > 255) val = 255; if (val < 0) diff --git a/mythtv/libs/libmythtv/visualisations/videovisualdefs.h b/mythtv/libs/libmythtv/visualisations/videovisualdefs.h index 61626796fae..092eae1742d 100644 --- a/mythtv/libs/libmythtv/visualisations/videovisualdefs.h +++ b/mythtv/libs/libmythtv/visualisations/videovisualdefs.h @@ -80,7 +80,7 @@ static inline void stereo16_from_stereopcm8(short *l, uchar *c, long cnt) { - while (cnt >= 4l) + while (cnt >= 4L) { l[0] = c[0]; r[0] = c[1]; @@ -93,18 +93,18 @@ static inline void stereo16_from_stereopcm8(short *l, l += 4; r += 4; c += 8; - cnt -= 4l; + cnt -= 4L; } - if (cnt > 0l) + if (cnt > 0L) { l[0] = c[0]; r[0] = c[1]; - if (cnt > 1l) + if (cnt > 1L) { l[1] = c[2]; r[1] = c[3]; - if (cnt > 2l) + if (cnt > 2L) { l[2] = c[4]; r[2] = c[5]; @@ -118,7 +118,7 @@ static inline void stereo16_from_stereopcm16(short *l, short *s, long cnt) { - while (cnt >= 4l) + while (cnt >= 4L) { l[0] = s[0]; r[0] = s[1]; @@ -131,18 +131,18 @@ static inline void stereo16_from_stereopcm16(short *l, l += 4; r += 4; s += 8; - cnt -= 4l; + cnt -= 4L; } - if (cnt > 0l) + if (cnt > 0L) { l[0] = s[0]; r[0] = s[1]; - if (cnt > 1l) + if (cnt > 1L) { l[1] = s[2]; r[1] = s[3]; - if (cnt > 2l) + if (cnt > 2L) { l[2] = s[4]; r[2] = s[5]; @@ -155,7 +155,7 @@ static inline void mono16_from_monopcm8(short *l, uchar *c, long cnt) { - while (cnt >= 4l) + while (cnt >= 4L) { l[0] = c[0]; l[1] = c[1]; @@ -163,16 +163,16 @@ static inline void mono16_from_monopcm8(short *l, l[3] = c[3]; l += 4; c += 4; - cnt -= 4l; + cnt -= 4L; } - if (cnt > 0l) + if (cnt > 0L) { l[0] = c[0]; - if (cnt > 1l) + if (cnt > 1L) { l[1] = c[1]; - if (cnt > 2l) + if (cnt > 2L) { l[2] = c[2]; } @@ -184,7 +184,7 @@ static inline void mono16_from_monopcm16(short *l, short *s, long cnt) { - while (cnt >= 4l) + while (cnt >= 4L) { l[0] = s[0]; l[1] = s[1]; @@ -192,16 +192,16 @@ static inline void mono16_from_monopcm16(short *l, l[3] = s[3]; l += 4; s += 4; - cnt -= 4l; + cnt -= 4L; } - if (cnt > 0l) + if (cnt > 0L) { l[0] = s[0]; - if (cnt > 1l) + if (cnt > 1L) { l[1] = s[1]; - if (cnt > 2l) + if (cnt > 2L) { l[2] = s[2]; } @@ -228,20 +228,20 @@ static inline void fast_short_set(short *p, short v, long c) { - while (c >= 4l) { + while (c >= 4L) { p[0] = v; p[1] = v; p[2] = v; p[3] = v; p += 4; - c -= 4l; + c -= 4L; } - if (c > 0l) { + if (c > 0L) { p[0] = v; - if (c > 1l) { + if (c > 1L) { p[1] = v; - if (c > 2l) { + if (c > 2L) { p[2] = v; } } @@ -252,21 +252,21 @@ static inline void fast_real_set_from_short(fftw_real *d, short *s, long c) { - while (c >= 4l) { + while (c >= 4L) { d[0] = fftw_real(s[0]); d[1] = fftw_real(s[1]); d[2] = fftw_real(s[2]); d[3] = fftw_real(s[3]); d += 4; s += 4; - c -= 4l; + c -= 4L; } - if (c > 0l) { + if (c > 0L) { d[0] = fftw_real(s[0]); - if (c > 1l) { + if (c > 1L) { d[1] = fftw_real(s[1]); - if (c > 2l) { + if (c > 2L) { d[2] = fftw_real(s[2]); } } @@ -278,7 +278,7 @@ static inline void fast_reals_set(fftw_real *p1, fftw_real v, long c) { - while (c >= 4l) { + while (c >= 4L) { p1[0] = v; p1[1] = v; p1[2] = v; @@ -289,16 +289,16 @@ static inline void fast_reals_set(fftw_real *p1, p2[3] = v; p1 += 4; p2 += 4; - c -= 4l; + c -= 4L; } - if (c > 0l) { + if (c > 0L) { p1[0] = v; p2[0] = v; - if (c > 1l) { + if (c > 1L) { p1[1] = v; p2[1] = v; - if (c > 2l) { + if (c > 2L) { p1[2] = v; p2[2] = v; } diff --git a/mythtv/libs/libmythui/DisplayResOSX.cpp b/mythtv/libs/libmythui/DisplayResOSX.cpp index 5e0f59d4906..5ff6cf16c24 100644 --- a/mythtv/libs/libmythui/DisplayResOSX.cpp +++ b/mythtv/libs/libmythui/DisplayResOSX.cpp @@ -20,7 +20,7 @@ bool DisplayResOSX::GetDisplayInfo(int &w_pix, int &h_pix, int &w_mm, h_mm = info.m_size.height(); w_pix = info.m_res.width(); h_pix = info.m_res.height(); - rate = 1000000.0f / info.m_rate; + rate = 1000000.0F / info.m_rate; par = 1.0; return true; } diff --git a/mythtv/libs/libmythui/mythdisplay.cpp b/mythtv/libs/libmythui/mythdisplay.cpp index a0da221828d..8e212dd63a6 100644 --- a/mythtv/libs/libmythui/mythdisplay.cpp +++ b/mythtv/libs/libmythui/mythdisplay.cpp @@ -18,7 +18,7 @@ #include #define LOC QString("DispInfo: ") -#define VALID_RATE(rate) ((rate) > 20.0f && (rate) < 200.0f) +#define VALID_RATE(rate) ((rate) > 20.0F && (rate) < 200.0F) static float fix_rate(int video_rate) { @@ -52,12 +52,12 @@ DisplayInfo MythDisplay::GetDisplayInfo(int video_rate) return ret; CFDictionaryRef ref = CGDisplayCurrentMode(disp); - float rate = 0.0f; + float rate = 0.0F; if (ref) rate = get_float_CF(ref, kCGDisplayRefreshRate); if (VALID_RATE(rate)) - ret.m_rate = 1000000.0f / rate; + ret.m_rate = 1000000.0F / rate; else ret.m_rate = fix_rate(video_rate); @@ -93,7 +93,7 @@ DisplayInfo MythDisplay::GetDisplayInfo(int video_rate) case 59: ret.m_rate = 16683; break; // 59.940Hz case 71: ret.m_rate = 13903; break; // 71.928Hz case 119: ret.m_rate = 8342; break; // 119.880Hz - default: ret.m_rate = 1000000.0f / (float)rate; + default: ret.m_rate = 1000000.0F / (float)rate; } } else @@ -137,13 +137,13 @@ DisplayInfo MythDisplay::GetDisplayInfo(int video_rate) ); if (VALID_RATE(rate)) - ret.m_rate = 1000000.0f / rate; + ret.m_rate = 1000000.0F / rate; else ret.m_rate = fix_rate(video_rate); ret.m_res = QSize((uint)width, (uint)height); ret.m_size = QSize((uint)width, (uint)height); if (xdpi > 0 && ydpi > 0) - ret.m_size = QSize((uint)width/xdpi*25.4f, (uint)height/ydpi*25.4f); + ret.m_size = QSize((uint)width/xdpi*25.4F, (uint)height/ydpi*25.4F); #endif return ret; } diff --git a/mythtv/libs/libmythui/mythgesture.h b/mythtv/libs/libmythui/mythgesture.h index 618071f2cf0..827d22ea7ed 100644 --- a/mythtv/libs/libmythui/mythgesture.h +++ b/mythtv/libs/libmythui/mythgesture.h @@ -225,7 +225,7 @@ class MythGesture size_t m_min_points {50}; size_t m_max_sequence {20}; int m_scale_ratio {4}; - float m_bin_percent {0.07f}; + float m_bin_percent {0.07F}; MythGestureEvent::Gesture m_last_gesture {MythGestureEvent::MaxGesture}; QList m_points; diff --git a/mythtv/libs/libmythui/mythnotificationcenter.h b/mythtv/libs/libmythui/mythnotificationcenter.h index 53ac34c3f46..2cbff41c89a 100644 --- a/mythtv/libs/libmythui/mythnotificationcenter.h +++ b/mythtv/libs/libmythui/mythnotificationcenter.h @@ -137,7 +137,7 @@ MUI_PUBLIC void ShowNotification(bool error, const QString &image = QString(), const QString &extra = QString(), const QString &progress_text = QString(), - float progress = -1.0f, + float progress = -1.0F, int duration = -1, bool fullscreen = false, const VNMask visibility = MythNotification::kAll, @@ -151,7 +151,7 @@ MUI_PUBLIC void ShowNotification(MythNotification::Type type, const QString &image = QString(), const QString &extra = QString(), const QString &progress_text = QString(), - float progress = -1.0f, + float progress = -1.0F, int duration = -1, bool fullscreen = false, const VNMask visibility = MythNotification::kAll, diff --git a/mythtv/libs/libmythui/mythnotificationcenter_private.h b/mythtv/libs/libmythui/mythnotificationcenter_private.h index ecb6827e041..b55763f9bb9 100644 --- a/mythtv/libs/libmythui/mythnotificationcenter_private.h +++ b/mythtv/libs/libmythui/mythnotificationcenter_private.h @@ -206,7 +206,7 @@ public slots: QString m_description; QString m_extra; int m_duration {-1}; - float m_progress {-1.0f}; + float m_progress {-1.0F}; QString m_progresstext; bool m_fullscreen {false}; bool m_added {false}; diff --git a/mythtv/libs/libmythui/mythrect.h b/mythtv/libs/libmythui/mythrect.h index ef8c342e134..e9a8dab71c3 100644 --- a/mythtv/libs/libmythui/mythrect.h +++ b/mythtv/libs/libmythui/mythrect.h @@ -64,10 +64,10 @@ class MUI_PUBLIC MythRect : public QRect bool parsePosition(float &percent, int &offset, int &absolute, const QString &value, bool is_size); - float m_percentWidth {0.0f}; - float m_percentHeight {0.0f}; - float m_percentX {0.0f}; - float m_percentY {0.0f}; + float m_percentWidth {0.0F}; + float m_percentHeight {0.0F}; + float m_percentX {0.0F}; + float m_percentY {0.0F}; int m_offsetWidth {0}; int m_offsetHeight {0}; int m_offsetX {0}; @@ -115,8 +115,8 @@ class MUI_PUBLIC MythPoint : public QPoint bool parsePosition(float &percent, int &offset, int &absolute, const QString &value); - float m_percentX {0.0f}; - float m_percentY {0.0f}; + float m_percentX {0.0F}; + float m_percentY {0.0F}; int m_offsetX {0}; int m_offsetY {0}; diff --git a/mythtv/libs/libmythui/mythrender_d3d9.cpp b/mythtv/libs/libmythui/mythrender_d3d9.cpp index 8b279e55bdd..d9f2b267840 100644 --- a/mythtv/libs/libmythui/mythrender_d3d9.cpp +++ b/mythtv/libs/libmythui/mythrender_d3d9.cpp @@ -454,7 +454,7 @@ bool MythRenderD3D9::ClearBuffer(void) return false; HRESULT hr = dev->Clear(0, nullptr, D3DCLEAR_TARGET, - D3DCOLOR_ARGB(0, 0, 0, 0), 1.0f, 0); + D3DCOLOR_ARGB(0, 0, 0, 0), 1.0F, 0); if (FAILED(hr)) { LOG(VB_GENERAL, LOG_ERR, D3DLOC + "Clear() failed."); @@ -610,24 +610,24 @@ void MythRenderD3D9::DrawRect(const QRect &rect, const QColor &color, int alpha) p_vertices[0].x = (float)rect.left(); p_vertices[0].y = (float)rect.top(); - p_vertices[0].z = 0.0f; + p_vertices[0].z = 0.0F; p_vertices[0].diffuse = clr; - p_vertices[0].rhw = 1.0f; + p_vertices[0].rhw = 1.0F; p_vertices[1].x = (float)(rect.left() + rect.width()); p_vertices[1].y = (float)rect.top(); - p_vertices[1].z = 0.0f; + p_vertices[1].z = 0.0F; p_vertices[1].diffuse = clr; - p_vertices[1].rhw = 1.0f; + p_vertices[1].rhw = 1.0F; p_vertices[2].x = (float)(rect.left() + rect.width()); p_vertices[2].y = (float)(rect.top() + rect.height()); - p_vertices[2].z = 0.0f; + p_vertices[2].z = 0.0F; p_vertices[2].diffuse = clr; - p_vertices[2].rhw = 1.0f; + p_vertices[2].rhw = 1.0F; p_vertices[3].x = (float)rect.left(); p_vertices[3].y = (float)(rect.top() + rect.height()); - p_vertices[3].z = 0.0f; + p_vertices[3].z = 0.0F; p_vertices[3].diffuse = clr; - p_vertices[3].rhw = 1.0f; + p_vertices[3].rhw = 1.0F; hr = m_rect_vertexbuffer->Unlock(); if (FAILED(hr)) @@ -1034,38 +1034,38 @@ bool MythRenderD3D9::UpdateVertexBuffer(IDirect3DVertexBuffer9* vertexbuffer, p_vertices[0].x = (float)dest.left(); p_vertices[0].y = (float)dest.top(); - p_vertices[0].z = 0.0f; + p_vertices[0].z = 0.0F; p_vertices[0].diffuse = color; - p_vertices[0].rhw = 1.0f; - p_vertices[0].t1u = ((float)src.left() - 0.5f) / (float)norm.width(); - p_vertices[0].t1v = ((float)src.top() - 0.5f) / (float)norm.height(); + p_vertices[0].rhw = 1.0F; + p_vertices[0].t1u = ((float)src.left() - 0.5F) / (float)norm.width(); + p_vertices[0].t1v = ((float)src.top() - 0.5F) / (float)norm.height(); p_vertices[1].x = (float)(dest.left() + dest.width()); p_vertices[1].y = (float)dest.top(); - p_vertices[1].z = 0.0f; + p_vertices[1].z = 0.0F; p_vertices[1].diffuse = color; - p_vertices[1].rhw = 1.0f; - p_vertices[1].t1u = ((float)(src.left() + src.width()) - 0.5f) / + p_vertices[1].rhw = 1.0F; + p_vertices[1].t1u = ((float)(src.left() + src.width()) - 0.5F) / (float)norm.width(); - p_vertices[1].t1v = ((float)src.top() - 0.5f) / (float)norm.height(); + p_vertices[1].t1v = ((float)src.top() - 0.5F) / (float)norm.height(); p_vertices[2].x = (float)(dest.left() + dest.width()); p_vertices[2].y = (float)(dest.top() + dest.height()); - p_vertices[2].z = 0.0f; + p_vertices[2].z = 0.0F; p_vertices[2].diffuse = color; - p_vertices[2].rhw = 1.0f; - p_vertices[2].t1u = ((float)(src.left() + src.width()) - 0.5f) / + p_vertices[2].rhw = 1.0F; + p_vertices[2].t1u = ((float)(src.left() + src.width()) - 0.5F) / (float)norm.width(); - p_vertices[2].t1v = ((float)(src.top() + src.height()) - 0.5f) / + p_vertices[2].t1v = ((float)(src.top() + src.height()) - 0.5F) / (float)norm.height(); p_vertices[3].x = (float)dest.left(); p_vertices[3].y = (float)(dest.top() + dest.height()); - p_vertices[3].z = 0.0f; + p_vertices[3].z = 0.0F; p_vertices[3].diffuse = color; - p_vertices[3].rhw = 1.0f; - p_vertices[3].t1u = ((float)src.left() - 0.5f) / (float)norm.width(); - p_vertices[3].t1v = ((float)(src.top() + src.height()) - 0.5f) / + p_vertices[3].rhw = 1.0F; + p_vertices[3].t1u = ((float)src.left() - 0.5F) / (float)norm.width(); + p_vertices[3].t1v = ((float)(src.top() + src.height()) - 0.5F) / (float)norm.height(); p_vertices[0].t2u = p_vertices[0].t1u; diff --git a/mythtv/libs/libmythui/mythuianimation.h b/mythtv/libs/libmythui/mythuianimation.h index ea9b240ecd7..75a6d8e5697 100644 --- a/mythtv/libs/libmythui/mythuianimation.h +++ b/mythtv/libs/libmythui/mythuianimation.h @@ -20,9 +20,9 @@ class UIEffects float x = xoff + rect.left(); float y = yoff + rect.top(); if (Middle == m_centre || Top == m_centre || Bottom == m_centre) - x += rect.width() / 2.0f; + x += rect.width() / 2.0F; if (Middle == m_centre || Left == m_centre || Right == m_centre) - y += rect.height() / 2.0f; + y += rect.height() / 2.0F; if (Right == m_centre || TopRight == m_centre || BottomRight == m_centre) x += rect.width(); if (Bottom == m_centre || BottomLeft == m_centre || BottomRight == m_centre) @@ -33,9 +33,9 @@ class UIEffects QRect GetExtent(const QSize &size); int m_alpha {255}; - float m_hzoom {1.0f}; - float m_vzoom {1.0f}; - float m_angle {0.0f}; + float m_hzoom {1.0F}; + float m_vzoom {1.0F}; + float m_angle {0.0F}; Centre m_centre {Middle}; }; diff --git a/mythtv/libs/libmythui/mythuieditbar.h b/mythtv/libs/libmythui/mythuieditbar.h index 3ae4eeac666..63eb24d6759 100644 --- a/mythtv/libs/libmythui/mythuieditbar.h +++ b/mythtv/libs/libmythui/mythuieditbar.h @@ -43,7 +43,7 @@ class MUI_PUBLIC MythUIEditBar : public MythUIType void CalcInverseRegions(void); void ClearImages(void); - float m_editPosition {0.0f}; + float m_editPosition {0.0F}; double m_total {1.0}; QList > m_regions; QList > m_invregions; diff --git a/mythtv/programs/mythcommflag/BlankFrameDetector.h b/mythtv/programs/mythcommflag/BlankFrameDetector.h index a2d88792548..8e059db7131 100644 --- a/mythtv/programs/mythcommflag/BlankFrameDetector.h +++ b/mythtv/programs/mythcommflag/BlankFrameDetector.h @@ -38,7 +38,7 @@ class BlankFrameDetector : public FrameAnalyzer private: HistogramAnalyzer *m_histogramAnalyzer; - float m_fps {0.0f}; + float m_fps {0.0F}; FrameAnalyzer::FrameMap m_blankMap; FrameAnalyzer::FrameMap m_breakMap; diff --git a/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp b/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp index fa0d42b02e9..fd0ac5b1079 100644 --- a/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp +++ b/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp @@ -197,7 +197,7 @@ bool PrePostRollFlagger::go() { //float elapsed = flagTime.elapsed() / 1000.0; - //float flagFPS = (elapsed > 0.0f) ? (framesProcessed / elapsed) : 0.0f; + //float flagFPS = (elapsed > 0.0F) ? (framesProcessed / elapsed) : 0.0F; if (m_myTotalFrames) cerr << "\b\b\b\b\b\b \b\b\b\b\b\b"; diff --git a/mythtv/programs/mythcommflag/SceneChangeDetector.h b/mythtv/programs/mythcommflag/SceneChangeDetector.h index 41140340c25..d5db5f5ac87 100644 --- a/mythtv/programs/mythcommflag/SceneChangeDetector.h +++ b/mythtv/programs/mythcommflag/SceneChangeDetector.h @@ -45,7 +45,7 @@ class SceneChangeDetector : public FrameAnalyzer private: HistogramAnalyzer *m_histogramAnalyzer {nullptr}; - float m_fps {0.0f}; + float m_fps {0.0F}; /* per-frame info */ SceneChangeData *m_scdata {nullptr}; diff --git a/mythtv/programs/mythcommflag/TemplateMatcher.h b/mythtv/programs/mythcommflag/TemplateMatcher.h index 7b7227ea2d3..01c5f4f8152 100644 --- a/mythtv/programs/mythcommflag/TemplateMatcher.h +++ b/mythtv/programs/mythcommflag/TemplateMatcher.h @@ -68,7 +68,7 @@ class TemplateMatcher : public FrameAnalyzer unsigned short *m_matches {nullptr}; /* matching pixels */ unsigned char *m_match {nullptr}; /* boolean result: 1/0 */ - float m_fps {0.0f}; + float m_fps {0.0F}; AVFrame m_cropped; /* pre-allocated buffer */ FrameAnalyzer::FrameMap m_breakMap; /* frameno => nframes */ diff --git a/mythtv/programs/mythfrontend/galleryslide.h b/mythtv/programs/mythfrontend/galleryslide.h index 9e9589f987b..afa111d00e6 100644 --- a/mythtv/programs/mythfrontend/galleryslide.h +++ b/mythtv/programs/mythfrontend/galleryslide.h @@ -17,8 +17,8 @@ // Min/max zoom extents available in slideshow -#define MIN_ZOOM (0.1f) -#define MAX_ZOOM (20.0f) +#define MIN_ZOOM (0.1F) +#define MAX_ZOOM (20.0F) class Slide; @@ -46,7 +46,7 @@ protected slots: protected: bool m_forwards {true}; //!< Play direction bool m_running {false}; //!< True whilst animation is active - float m_speed {0.0f}; //!< Real-time = 1.0, Double-speed = 2.0 + float m_speed {0.0F}; //!< Real-time = 1.0, Double-speed = 2.0 }; @@ -190,7 +190,7 @@ public slots: ImagePtrK m_data {nullptr}; //!< The image currently loading/loaded //! The most recently requested image. Null for preloads. Differs from m_data when skipping ImagePtrK m_waitingFor {nullptr}; - float m_zoom {1.0f}; //!< Current zoom, 1.0 = fullsize + float m_zoom {1.0F}; //!< Current zoom, 1.0 = fullsize //! Navigation that created this image, -1 = Prev, 0 = Update, 1 = Next int m_direction {0}; Animation *m_zoomAnimation {nullptr}; //!< Dedicated animation for zoom, if supported