[haiku-commits] haiku: hrev52932 - src/add-ons/media/media-add-ons/mixer

  • From: Barrett17 <b.vitruvio@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 25 Feb 2019 06:56:43 -0500 (EST)

hrev52932 adds 1 changeset to branch 'master'
old head: 9cd8943940e9e72ad51025968f290503667f60de
new head: 5b88998b2dae7618b3e7acd26ce4db05b2812fc3
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=5b88998b2dae+%5E9cd8943940e9

----------------------------------------------------------------------------

5b88998b2dae: media-add-ons/mixer: Fix -Werror=class-memaccess
  
  Fix -Werror=class-memaccess, pointed by gcc8.
  * AudioMixer.cpp: replace memset() with media_format.Clear().
  * MixerAddOn.cpp: remove unneed memset(), since constractor of
    media_format already runs memset().
  
  Change-Id: Idfb68c4d3190aeed725d905e46b0f85354962bc9
  Reviewed-on: https://review.haiku-os.org/c/1112
  Reviewed-by: Barrett17 <b.vitruvio@xxxxxxxxx>

                                      [ Murai Takashi <tmurai01@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev52932
Commit:      5b88998b2dae7618b3e7acd26ce4db05b2812fc3
URL:         https://git.haiku-os.org/haiku/commit/?id=5b88998b2dae
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sun Feb 24 21:42:29 2019 UTC
Committer:   Barrett17 <b.vitruvio@xxxxxxxxx>
Commit-Date: Mon Feb 25 11:56:40 2019 UTC

----------------------------------------------------------------------------

2 files changed, 3 insertions(+), 4 deletions(-)
src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp | 6 +++---
src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp | 1 -

----------------------------------------------------------------------------

diff --git a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp 
b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
index 4bf0978dac..5d2ebb13f0 100644
--- a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
@@ -275,7 +275,7 @@ AudioMixer::GetNextInput(int32 *cookie, media_input 
*out_input)
                out_input->source = media_source::null;
                out_input->destination.port = ControlPort();
                out_input->destination.id = 0;
-               memset(&out_input->format, 0, sizeof(out_input->format));
+               out_input->format.Clear();
                out_input->format.type = B_MEDIA_RAW_AUDIO;
                strcpy(out_input->name, "Free Input");
                *cookie += 1;
@@ -532,7 +532,7 @@ AudioMixer::FormatSuggestionRequested(media_type type, 
int32 quality,
                return B_MEDIA_BAD_FORMAT;
 
        // we can produce any (wildcard) raw audio format
-       memset(format, 0, sizeof(*format));
+       format->Clear();
        format->type = B_MEDIA_RAW_AUDIO;
        return B_OK;
 }
@@ -686,7 +686,7 @@ AudioMixer::GetNextOutput(int32 *cookie, media_output 
*out_output)
                out_output->source.port = ControlPort();
                out_output->source.id = 0;
                out_output->destination = media_destination::null;
-               memset(&out_output->format, 0, sizeof(out_output->format));
+               out_output->format.Clear();
                out_output->format.type = B_MEDIA_RAW_AUDIO;
                strcpy(out_output->name, "Mixer Output");
        }
diff --git a/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp 
b/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp
index 18c6eec252..e17ee386c2 100644
--- a/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/MixerAddOn.cpp
@@ -29,7 +29,6 @@ AudioMixerAddon::AudioMixerAddon(image_id image)
        fFormat(new media_format),
        fInfo(new flavor_info)
 {
-       memset(fFormat, 0, sizeof(*fFormat));
        fFormat->type = B_MEDIA_RAW_AUDIO;
        fFormat->u.raw_audio = media_raw_audio_format::wildcard;
 


Other related posts:

  • » [haiku-commits] haiku: hrev52932 - src/add-ons/media/media-add-ons/mixer - Barrett17