Merge branch 'master' of github.com:MythTV/mythtv

Author: NigelPearson

mythplugins/mythmusic/mythmusic/goom/filters.c

@@ -140,6 +140,14 @@ static int *firedec = 0;
 /** modif d'optim by Jeko : precalcul des 4 coefs résultant des 2 pos */
 int     precalCoef[16][16];
 
+/* Prototypes to keep gcc from spewing warnings */
+void generatePrecalCoef (void);
+void calculatePXandPY (int x, int y, int *px, int *py);
+void setPixelRGB (Uint * buffer, Uint x, Uint y, Color c);
+void setPixelRGB_ (Uint * buffer, Uint x, Color c);
+inline void getPixelRGB (Uint * buffer, Uint x, Uint y, Color * c);
+void getPixelRGB_ (Uint * buffer, Uint x, Color * c);
+
 void
 generatePrecalCoef ()
 {
@@ -467,6 +475,9 @@ void c_zoom (unsigned int *expix1, unsigned int *expix2, unsigned int prevX, uns
 }
 
 #ifdef USE_ASM
+void setAsmUse (int useIt);
+int getAsmUse (void);
+
 static int use_asm = 1;
 void
 setAsmUse (int useIt)
@@ -542,6 +553,9 @@ zoomFilterFastRGB (Uint * pix1, Uint * pix2, ZoomFilterData * zf, Uint resx, Uin
 		noisify = zf->noisify;
 	}
 
+	/* Silence a gcc warning */
+	(void)pertedec;
+
 	/** generation d'un effet **/
 	if (firstTime || zf) {
 

mythplugins/mythmusic/mythmusic/goom/goom_core.h

@@ -14,6 +14,6 @@ void    goom_set_resolution (guint32 resx, guint32 resy, int cinemascope);
  * forceMode == 1..NB_FX : force a switch to FX n°forceMode
  */
 guint32 *goom_update (gint16 data[2][512], int forceMode);
-void    goom_close ();
+void    goom_close (void);
 
 #endif

mythplugins/mythmusic/mythmusic/goom/surf3d.c

@@ -57,6 +57,9 @@ void surf3d_draw (surf3d *s, int color, int dist, int *buf, int *back, int W,int
 			*p1 = color;
 		}
 	}
+
+	/* Squelch a gcc warning */
+	(void)p2;
 }
 
 void grid3d_draw (grid3d *g, int color, int colorlow,

mythplugins/mythmusic/mythmusic/goom/tentacle3d.c

@@ -15,6 +15,11 @@ static float cycle = 0.0f;
 static grid3d *grille[nbgrid];
 static float *vals;
 
+/* Prototypes to keep gcc from spewing warnings */
+void tentacle_free (void);
+void tentacle_new (void);
+void tentacle_update(int *buf, int *back, int W, int H, short data[2][512], float rapport, int drawit);
+
 void tentacle_free (void) {
         int tmp;
 	free (vals);

mythplugins/mythmusic/mythmusic/goom/zoom_filter_mmx.c

@@ -1,3 +1,7 @@
+/* Prototypes to keep gcc from spewing warnings */
+void    zoom_filter_mmx (int prevX, int prevY, unsigned int *expix1, unsigned int *expix2, int *brutS, int *brutD, int buffratio, int precalCoef[16][16]);
+int 	zoom_filter_mmx_supported (void);
+
 #ifdef MMX
 #define BUFFPOINTNB 16
 #define BUFFPOINTMASK 0xffff

mythplugins/mythmusic/mythmusic/goom/zoom_filter_xmmx.c

@@ -1,5 +1,10 @@
 #include <mythtv/mythconfig.h>
 
+/* Prototypes to keep gcc from spewing warnings */
+void    zoom_filter_xmmx (int prevX, int prevY, unsigned int *expix1, unsigned int *expix2, int *brutS, int *brutD, int buffratio, int precalCoef[16][16]);
+int 	zoom_filter_xmmx_supported (void);
+
+
 #if defined(MMX) && !defined(ARCH_X86_64)
 /* a definir pour avoir exactement le meme resultat que la fonction C
  * (un chouillat plus lent)

mythtv/libs/libmythtv/audioplayer.cpp

@@ -70,6 +70,16 @@ void AudioPlayer::RemoveVisuals(void)
         m_audioOutput->removeVisual(m_visuals[i]);
 }
 
+void AudioPlayer::ResetVisuals(void)
+{
+    if (!m_audioOutput)
+        return;
+
+    QMutexLocker lock(&m_lock);
+    for (uint i = 0; i < m_visuals.size(); i++)
+        m_visuals[i]->prepare();
+}
+
 void AudioPlayer::Reset(void)
 {
     if (!m_audioOutput)
@@ -164,6 +174,8 @@ QString AudioPlayer::ReinitAudio(void)
         m_muted_on_creation = false;
     }
 
+    ResetVisuals();
+
     return errMsg;
 }
 
@@ -257,6 +269,8 @@ void AudioPlayer::SetAudioParams(AudioFormat format, int orig_channels,
     m_samplerate    = samplerate;
     m_passthru      = passthru;
     m_codec_profile = codec_profile;
+
+    ResetVisuals();
 }
 
 void AudioPlayer::SetEffDsp(int dsprate)

mythtv/libs/libmythtv/audioplayer.h

@@ -77,6 +77,7 @@ class MTV_PUBLIC AudioPlayer
   private:
     void AddVisuals(void);
     void RemoveVisuals(void);
+    void ResetVisuals(void);
 
   private:
     MythPlayer  *m_parent;

mythtv/libs/libmythtv/mythplayer.cpp

@@ -4850,10 +4850,17 @@ bool MythPlayer::CanVisualise(void)
     return false;
 }
 
-bool MythPlayer::ToggleVisualisation(void)
+bool MythPlayer::IsVisualising(void)
 {
     if (videoOutput)
-        return videoOutput->ToggleVisualisation(&audio);
+        return videoOutput->GetVisualisation();
+    return false;
+}
+
+bool MythPlayer::EnableVisualisation(bool enable)
+{
+    if (videoOutput)
+        return videoOutput->EnableVisualisation(&audio, enable);
     return false;
 }
 

mythtv/libs/libmythtv/mythplayer.h

@@ -304,7 +304,8 @@ class MTV_PUBLIC MythPlayer
 
     // Visualisations
     bool CanVisualise(void);
-    bool ToggleVisualisation(void);
+    bool IsVisualising(void);
+    bool EnableVisualisation(bool enable);
 
     void SaveTotalDuration(void);
     void ResetTotalDuration(void);