Introduce STATIC_ASSERT and use it to verify wchar_t==utf16, fix some other compile errors and warnings

2 files changed, 0 insertions, 46 deletions

diff --git a/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp b/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp
index 9d1844661c..60fc91535b 100644
--- a/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp
+++ b/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp
@@ -472,30 +472,6 @@ static int mp4_seek_sample(struct input_plugin_data *ip_data, int sample)
     return mp4_current_sample(ip_data);
 }
 
-static int mp4_seek(struct input_plugin_data *ip_data, double offset)
-{
-    struct mp4_private *priv;
-    MP4SampleId sample;
-    uint32_t scale;
-
-    priv = (mp4_private*) ip_data->private_ipd;
-
-    scale = MP4GetTrackTimeScale(priv->mp4.handle, priv->mp4.track);
-    if (scale == 0)
-        return -IP_ERROR_INTERNAL;
-
-    sample = MP4GetSampleIdFromTime(priv->mp4.handle, priv->mp4.track,
-        (MP4Timestamp)(offset * (double)scale), 0);
-    if (sample == MP4_INVALID_SAMPLE_ID)
-        return -IP_ERROR_INTERNAL;
-
-    qDebug() << "seeking from sample" << priv->mp4.sample << "to sample" << sample;
-    priv->mp4.sample = sample;
-    priv->overflow_buf_len = 0;
-
-    return priv->mp4.sample;
-}
-
 /* commented because we use TagLib now ??? -- bkgood
 static int mp4_read_comments(struct input_plugin_data *ip_data,
         struct keyval **comments)
@@ -564,22 +540,6 @@ static int mp4_read_comments(struct input_plugin_data *ip_data,
 }
 */
 
-static int mp4_duration(struct input_plugin_data *ip_data)
-{
-    struct mp4_private *priv;
-    uint32_t scale;
-    uint64_t duration;
-
-    priv = (mp4_private*) ip_data->private_ipd;
-
-    scale = MP4GetTrackTimeScale(priv->mp4.handle, priv->mp4.track);
-    if (scale == 0)
-        return 0;
-
-    duration = MP4GetTrackDuration(priv->mp4.handle, priv->mp4.track);
-
-    return duration / scale;
-}
 /*
 const struct input_plugin_ops ip_ops = {
     .open = mp4_open,
diff --git a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp
index 303cd1f9e1..57ceadbef4 100644
--- a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp
+++ b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp
@@ -53,7 +53,6 @@ SoundSourceMediaFoundation::SoundSourceMediaFoundation(QString filename)
     : SoundSource(filename)
     , m_pReader(NULL)
     , m_pAudioType(NULL)
-    , m_wcFilename(NULL)
     , m_nextFrame(0)
     , m_leftoverBuffer(NULL)
     , m_leftoverBufferSize(0)
@@ -69,15 +68,10 @@ SoundSourceMediaFoundation::SoundSourceMediaFoundation(QString filename)
     setType("m4a");
     setChannels(kNumChannels);
     setSampleRate(kSampleRate);
-
-    // http://social.msdn.microsoft.com/Forums/en/netfxbcl/thread/35c6a451-3507-40c8-9d1c-8d4edde7c0cc
-    // gives maximum path + file length as 248 + 260, using that -bkgood
-    m_wcFilename = new wchar_t[248 + 260];
 }
 
 SoundSourceMediaFoundation::~SoundSourceMediaFoundation()
 {
-    delete [] m_wcFilename;
     delete [] m_leftoverBuffer;
 
     safeRelease(&m_pReader);