Prepare for 0.3.3

savonet · Jan 4, 2023 · 12bfdf2 · 12bfdf2
1 parent b382211
commit 12bfdf2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 32 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,4 @@
-0.3.3 (unreleased)
+0.3.3 (04-01-2022)
 =====
 * Bring back dynamic loader (#5)
 

diff --git a/dune-project b/dune-project
@@ -14,6 +14,7 @@
  (synopsis "Fraunhofer FDK AAC Codec Library")
  (description "The FDK AAC Codec Library For Android contains an encoder implementation of the Advanced Audio Coding (AAC) audio codec.")
  (depends
+  conf-fdkaac
   dune
   dune-configurator)
 )
diff --git a/examples/wav2aac.ml b/examples/wav2aac.ml
@@ -171,12 +171,12 @@ let _ =
         output_string oc ret
       done
     with
-    | End_of_file -> ()
-    | Fdkaac.Encoder.Error _ as e ->
-        failwith
-          (match Fdkaac.Encoder.string_of_exception e with
-            | Some s -> s
-            | None -> "Unknown error.")
+      | End_of_file -> ()
+      | Fdkaac.Encoder.Error _ as e ->
+          failwith
+            (match Fdkaac.Encoder.string_of_exception e with
+              | Some s -> s
+              | None -> "Unknown error.")
   end;
   let ret =
     try Fdkaac.Encoder.flush enc

diff --git a/fdkaac.opam b/fdkaac.opam
@@ -10,6 +10,7 @@ license: "GPL-2.0"
 homepage: "https://github.com/savonet/ocaml-fdkaac"
 bug-reports: "https://github.com/savonet/ocaml-fdkaac/issues"
 depends: [
+  "conf-fdkaac"
   "dune" {>= "2.9"}
   "dune-configurator"
   "odoc" {with-doc}
@@ -31,12 +32,3 @@ build: [
   ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/savonet/ocaml-fdkaac.git"
-depexts: [
-  ["fdk-aac-dev"] {os-distribution = "alpine"}
-  ["libfdk-aac"] {os-distribution = "arch"}
-  ["fdk-aac-devel"] {os-distribution = "centos"}
-  ["fdk-aac-devel"] {os-distribution = "fedora"}
-  ["fdk-aac-devel"] {os-family = "suse"}
-  ["libfdk-aac-dev"] {os-family = "debian"}
-  ["fdk-aac"] {os = "macos" & os-distribution = "homebrew"}
-]
diff --git a/fdkaac.opam.template b/fdkaac.opam.template
diff --git a/src/fdkaac.ml b/src/fdkaac.ml
@@ -60,17 +60,12 @@ module Encoder = struct
 
   external info : enc -> info = "ocaml_fdkaac_info"
 
-  type t = {
-    enc : enc;
-    mutable info : info option;
-    buffer : Buffer.t;
-    chans : int;
-  }
+  type t = { enc : enc; mutable info : info option; buffer : Buffer.t }
 
   external create : int -> enc = "ocaml_fdkaac_init_enc"
 
   let create chans =
-    { enc = create chans; info = None; buffer = Buffer.create 1024; chans }
+    { enc = create chans; info = None; buffer = Buffer.create 1024 }
 
   type mpeg2_aac = [ `AAC_LC | `HE_AAC | `HE_AAC_v2 ]
   type mpeg4_aac = [ mpeg2_aac | `AAC_LD | `AAC_ELD ]