diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.cpp b/mythtv/libs/libmyth/audio/audiooutputjack.cpp index e4ae7411e1c..cf11c93ac1b 100644 --- a/mythtv/libs/libmyth/audio/audiooutputjack.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputjack.cpp @@ -447,7 +447,7 @@ int AudioOutputJACK::JackXRunCallback(void) // All we want to do is chuck away some audio from the ring buffer // to keep our audio output roughly where it should be if we didn't xrun int fragments = (int)ceilf( ((delay / 1000000.0F) * m_samplerate ) - / (float)(m_fragment_size / m_output_bytes_per_frame) ); + / ((float)m_fragment_size / m_output_bytes_per_frame) ); m_jack_xruns += fragments; //should be at least 1... VBERROR(QString("Jack XRun Callback: %1 usecs delayed, xruns now %2") .arg(delay).arg(m_jack_xruns) ); diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp index 02ae3bfff80..b0501f3dd4e 100644 --- a/mythtv/libs/libmythtv/tv_play.cpp +++ b/mythtv/libs/libmythtv/tv_play.cpp @@ -6656,7 +6656,7 @@ void TV::DoArbSeek(PlayerContext *ctx, ArbSeekWhence whence, if (!ok) return; - float time = ((seek / 100) * 3600) + ((seek % 100) * 60); + float time = ((seek / 100.0F) * 3600) + ((seek % 100) * 60); if (whence == ARBSEEK_FORWARD) DoSeek(ctx, time, tr("Jump Ahead"), diff --git a/mythtv/libs/libmythtv/visualisations/goom/filters.c b/mythtv/libs/libmythtv/visualisations/goom/filters.c index 44547388839..6685e74ca22 100644 --- a/mythtv/libs/libmythtv/visualisations/goom/filters.c +++ b/mythtv/libs/libmythtv/visualisations/goom/filters.c @@ -605,7 +605,11 @@ zoomFilterFastRGB (Uint * pix1, Uint * pix2, ZoomFilterData * zf, Uint resx, Uin } for (us = 0; us < 0xffff; us++) { - sintable[us] = (int) (1024 * sin ((double) us * 360 / (sizeof (sintable) / sizeof (sintable[0]) - 1) * 3.141592 / 180) + .5); + sintable[us] = + roundf(1024 * sin ((double) us * 360 + / ((float)sizeof (sintable) + / sizeof (sintable[0]) - 1) + * 3.141592 / 180)); } { diff --git a/mythtv/libs/libmythtv/visualisations/goom/goom_core.c b/mythtv/libs/libmythtv/visualisations/goom/goom_core.c index 3f2c2057c28..abbceb0704b 100644 --- a/mythtv/libs/libmythtv/visualisations/goom/goom_core.c +++ b/mythtv/libs/libmythtv/visualisations/goom/goom_core.c @@ -252,16 +252,16 @@ guint32 * goom_update (gint16 data[2][512], int forceMode) { ((pointHeight - 6.0F) * largfactor + 5.0F), i * 152.0F, 128.0F, s_loopVar + i * 2032); pointFilter (p1 + c_offset, ORANGE, - ((pointWidth / 2) * largfactor) / i + 10.0F * i, - ((pointHeight / 2) * largfactor) / i + 10.0F * i, + ((pointWidth / 2.0F) * largfactor) / i + 10.0F * i, + ((pointHeight / 2.0F) * largfactor) / i + 10.0F * i, 96.0F, i * 80.0F, s_loopVar / i); pointFilter (p1 + c_offset, VIOLET, - ((pointHeight / 3 + 5.0F) * largfactor) / i + 10.0F * i, - ((pointHeight / 3 + 5.0F) * largfactor) / i + 10.0F * i, + ((pointHeight / 3.0F + 5.0F) * largfactor) / i + 10.0F * i, + ((pointHeight / 3.0F + 5.0F) * largfactor) / i + 10.0F * i, i + 122.0F, 134.0F, s_loopVar / i); pointFilter (p1 + c_offset, BLACK, - ((pointHeight / 3) * largfactor + 20.0F), - ((pointHeight / 3) * largfactor + 20.0F), + ((pointHeight / 3.0F) * largfactor + 20.0F), + ((pointHeight / 3.0F) * largfactor + 20.0F), 58.0F, i * 66.0F, s_loopVar / i); pointFilter (p1 + c_offset, WHITE, (pointHeight * largfactor + 10.0F * i) / i, @@ -887,7 +887,7 @@ void choose_a_goom_line (float *param1, float *param2, int *couleur, int *mode, break; case GML_HLINE: if (iRAND (4) || far) { - *param1 = c_resoly / 7; + *param1 = c_resoly / 7.0F; *param2 = 6.0F * c_resoly / 7.0F; } else { diff --git a/mythtv/libs/libmythtv/visualisations/goom/surf3d.c b/mythtv/libs/libmythtv/visualisations/goom/surf3d.c index f0b506eb7fc..86f50522649 100644 --- a/mythtv/libs/libmythtv/visualisations/goom/surf3d.c +++ b/mythtv/libs/libmythtv/visualisations/goom/surf3d.c @@ -32,9 +32,9 @@ grid3d *grid3d_new (int sizex, int defx, int sizez, int defz, v3d center) { x = defx; while (x) { --x; - s->vertex[x+defx*y].x = (float)(x-defx/2)*sizex/defx; + s->vertex[x+defx*y].x = (x-defx/2.0F)*sizex/defx; s->vertex[x+defx*y].y = 0; - s->vertex[x+defx*y].z = (float)(y-defz/2)*sizez/defz; + s->vertex[x+defx*y].z = (y-defz/2.0F)*sizez/defz; } } return g; diff --git a/mythtv/libs/libmythui/mythuitext.cpp b/mythtv/libs/libmythui/mythuitext.cpp index f31be11abab..56e9a668888 100644 --- a/mythtv/libs/libmythui/mythuitext.cpp +++ b/mythtv/libs/libmythui/mythuitext.cpp @@ -751,11 +751,10 @@ bool MythUIText::GetNarrowWidth(const QStringList & paragraphs, too_narrow = width; // Too narrow? How many lines didn't fit? - qreal lines = static_cast - ((height - m_drawRect.height()) / line_height); + qreal lines = roundf((height - m_drawRect.height()) / line_height); lines -= (1.0 - last_line_width / width); width += (lines * width) / - (m_drawRect.height() / line_height); + ((double)m_drawRect.height() / line_height); if (width > best_width || static_cast(width) == last_width) { @@ -769,8 +768,7 @@ bool MythUIText::GetNarrowWidth(const QStringList & paragraphs, if (best_width > width) best_width = width; - qreal lines = static_cast - (m_Area.height() - height) / line_height; + qreal lines = floor((m_Area.height() - height) / line_height); if (lines >= 1) { // Too wide?