Skip to content
Snippets Groups Projects
  1. Feb 22, 2025
  2. Feb 18, 2025
  3. Feb 15, 2025
  4. Feb 13, 2025
    • Petter Reinholdtsen's avatar
      Merge branch 'conf-option-oggz' into 'master' · 27ece4e3
      Petter Reinholdtsen authored
      Implemented --disable-oggz to ignore oggz when present.
      
      Closes #14
      
      See merge request !6
      27ece4e3
    • Petter Reinholdtsen's avatar
      Implemented --disable-oggz to ignore oggz when present. · d0bfb729
      Petter Reinholdtsen authored
      This disable to configure check for oggz and avoid building examples using liboggz.
      Added CI test to verify the option work.
      
      Fixes #14
      d0bfb729
    • Petter Reinholdtsen's avatar
      Merge branch 'fix-flac-init-return-values' into 'master' · f92bc4c4
      Petter Reinholdtsen authored
      Make sure to check the correct flac init return values.
      
      See merge request !5
      f92bc4c4
    • Petter Reinholdtsen's avatar
      Make sure to check the correct flac init return values. · 5c2b7f3b
      Petter Reinholdtsen authored
      Check for valid return values when calling
      FLAC__stream_encoder_init_stream() and FLAC__stream_decoder_init_stream().
      
      Handle non-OK return values as an error, instead of looking for
      return values that can not be returned from these methods.  Note, the
      integer value for both FLAC__STREAM_DECODER_SEARCH_FOR_METADATA,
      FLAC__STREAM_ENCODER_OK, FLAC__STREAM_DECODER_INIT_STATUS_OK and
      FLAC__STREAM_ENCODER_INIT_STATUS_OK are all zero, so the behaviour of the
      code do not change.
      
      This change avoid the following compiler message:
      
        flac.c: In function ‘fs_flac_decode_header’:
        flac.c:269:10: warning: comparison between ‘FLAC__StreamDecoderInitStatus’ and ‘enum <anonymous>’ [-Wenum-compare]
          269 |        ) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
              |          ^~
        flac.c: In function ‘fs_flac_enc_headers’:
        flac.c:610:10: warning: comparison between ‘FLAC__StreamEncoderInitStatus’ and ‘enum <anonymous>’ [-Wenum-compare]
          610 |        ) != FLAC__STREAM_ENCODER_OK)
              |          ^~
      5c2b7f3b
    • Petter Reinholdtsen's avatar
      Merge branch 'fix-oggz-examples' into 'master' · 181f9956
      Petter Reinholdtsen authored
      Use correct oggz argument type in examples.
      
      Closes #13
      
      See merge request !4
      181f9956
  5. Feb 09, 2025
    • Ralph Giles's avatar
      Merge branch 'comment-free-return-int' into 'master' · a60090c4
      Ralph Giles authored
      Changed expected function signature of fs_vector_foreach to expect void.
      
      See merge request !3
      a60090c4
    • Petter Reinholdtsen's avatar
      Changed expected function signature of fs_vector_foreach to expect void. · 0a6943be
      Petter Reinholdtsen authored
      This bring the method in ine with the return type of fs_comment_free().
      
      This avoid the following compiler message:
      
        comments.c: In function 'fish_sound_comments_free':
        comments.c:426:40: error: cast between incompatible function types from 'void (*)(FishSoundComment *)' {aka 'void (*)(struct _FishSoundComment *)'} to 'int (*)(void *)' [-Werror=cast-function-type]
          426 |   fs_vector_foreach (fsound->comments, (FishSoundFunc)fs_comment_free);
              |                                        ^
      0a6943be
    • Petter Reinholdtsen's avatar
      Use correct oggz argument type in examples. · e1ee9862
      Petter Reinholdtsen authored
      The examples using oggz must use oggz_package as the
      second argument to read_package for the callback to be acceptable by
      oggz_set_read_callback().  Adjust the method signature to use
      oggz_package and extract the required ogg_package members from this
      one to avoid compiler message like this:
      
      fishsound-identify.c: In function ‘main’:
      fishsound-identify.c:101:37: warning: passing argument 3 of ‘oggz_set_read_callback’ from incompatible pointer type [-Wincompatible-pointer-types]
        101 |   oggz_set_read_callback (oggz, -1, read_packet, NULL);
            |                                     ^~~~~~~~~~~
            |                                     |
            |                                     int (*)(OGGZ *, ogg_packet *, long int,  void *) {aka int (*)(void *, ogg_packet *, long int,  void *)}
      In file included from /usr/include/oggz/oggz.h:576,
                       from fishsound-identify.c:39:
      /usr/include/oggz/oggz_read.h:109:44: note: expected ‘OggzReadPacket’ {aka ‘int (*)(void *, oggz_packet *, long int,  void *)’} but argument is of type ‘int (*)(OGGZ *, ogg_packet *, long int,  void *)’ {aka ‘int (*)(void *, ogg_packet *, long int,  void *)’}
        109 |                             OggzReadPacket read_packet, void * user_data);
            |                             ~~~~~~~~~~~~~~~^~~~~~~~~~~
      
      Fixes #13
      e1ee9862
    • Petter Reinholdtsen's avatar
      Merge branch 'autoconf-m4-subdir' into 'master' · 5115cc7a
      Petter Reinholdtsen authored
      Patch configure.ac to specify config macro dir.
      
      See merge request !2
      5115cc7a
    • Petter Reinholdtsen's avatar
      Changed identifiers "__FISH_SOUND_H__" and "_FishSoundFlacInfo" to avoid C++... · 9c5fcfe8
      Petter Reinholdtsen authored
      Changed identifiers "__FISH_SOUND_H__" and "_FishSoundFlacInfo" to avoid C++ naming convention conflict.
      
      <URL: https://wiki.sei.cmu.edu/confluence/display/cplusplus/DCL51-CPP.+Do+not+declare+or+define+a+reserved+identifier >
      states:
      
        "Each name that contains a double underscore __ or begins with an underscore
        followed by an uppercase letter is reserved to the implementation for any use."
      
      Changed __FISH_SOUND_H__ to FISH_SOUND_H_INCLUDED and dropped unused
      _FishSoundFlacInfo to avoid conflicting with this convention.
      
      Fixes #12.
      9c5fcfe8
  6. Feb 08, 2025
  7. Jul 16, 2010
    • conrad's avatar
      Drop Requires: line from fishsound.pc.in · 6815cab6
      conrad authored
      This line is only needed if packages that build against libfishsound
      needs access to the Cflags of the required packages. In this case, the
      listed packages (vorbis, speex, flac) are precisely the packages that
      libfishsound provide a wrapper API for, so apps compiling against
      libfishsound really should not need their headers directly.
      
      This was not a problem in 0.9.1, but in 1.0.0 the FLAC headers are
      exported, and this include a really regrettably misnamed assert.h, which
      shadows the system assert.h and causes compilation of sonic-visualiser
      to fail.
      
      I've tried removing the Requires: line and can report that it results in
      a functioning sonic-visualiser build.
      
      Reported-by: hircus
      6815cab6
  8. May 27, 2010
  9. Apr 19, 2010
  10. Apr 10, 2010
  11. Apr 01, 2010
  12. Feb 03, 2010
  13. Feb 02, 2010
    • conrad's avatar
      Mozilla #520500: Allow NULL-value comments · e56f4d8a
      conrad authored
      This commit changes the policy of fs_comment_validate_byname() to
      allow NULL-value comments, and changes fs_comment_new() to handle
      the case where value=NULL.
      
      This commit should pass "make check", including the policy change
      introduced in the previous commit.
      e56f4d8a
    • conrad's avatar
      tests: allow NULL-valued comments · d0b3830b
      conrad authored
      This test changes the policy on what comments are valid, to allow
      plain comments, not of the form KEY=VALUE (the condition reported
      in Mozilla #520500).
      
      As this commit only modifies the test suite, 'make check' is
      expected to fail.
      d0b3830b
    • conrad's avatar
      Revert ac2015db, 46faa6b4 · 0e01ba99
      conrad authored
      This reverts the following commits:
      
      "Mozilla 520500: test for (len > 0)"
      46faa6b4
      
      Revert "Mozilla 520500, Mozilla 521863"
      ac2015db
      
      Due to a regression introduced by ac2015db, which fails to pass
      "make check", and chops the first character off all comment values.
      0e01ba99
  14. Nov 23, 2009
  15. Oct 18, 2009
    • conrad's avatar
      Mozilla 520500: test for (len > 0) · 46faa6b4
      conrad authored
      This change was present in the patch for 520500 but not 521863.
      Applied separately after discussion with Chris Pearce.
      46faa6b4
  16. Oct 17, 2009
Loading