projects / platform / upstream / flac.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9f28b59)
add encoder examples
authorJosh Coalson <jcoalson@users.sourceforce.net>
Thu, 13 Sep 2007 00:38:08 +0000 (00:38 +0000)
committerJosh Coalson <jcoalson@users.sourceforce.net>
Thu, 13 Sep 2007 00:38:08 +0000 (00:38 +0000)
FLAC.dsw patch | blob | history
FLAC.sln patch | blob | history
configure.in patch | blob | history
examples/Makefile.lite patch | blob | history
examples/README patch | blob | history
examples/c/Makefile.am patch | blob | history
examples/cpp/Makefile.am patch | blob | history

diff --git a/FLAC.dsw b/FLAC.dsw
index fe4e8f7..c2e338a 100644 (file)
--- a/FLAC.dsw
+++ b/FLAC.dsw
@@ -207,8 +207,14 @@ Package=<4>
     Project_Dep_Name example_c_decode_file\r
     End Project Dependency\r
     Begin Project Dependency\r
+    Project_Dep_Name example_c_encode_file\r
+    End Project Dependency\r
+    Begin Project Dependency\r
     Project_Dep_Name example_cpp_decode_file\r
     End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name example_cpp_encode_file\r
+    End Project Dependency\r
 }}}\r
 \r
 ###############################################################################\r
@@ -228,6 +234,21 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "example_c_encode_file"=.\examples\c\encode\file\example_c_encode_file.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libFLAC_static\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "example_cpp_decode_file"=.\examples\cpp\decode\file\example_cpp_decode_file.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -246,6 +267,24 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "example_cpp_encode_file"=.\examples\cpp\encode\file\example_cpp_encode_file.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libFLAC++_static\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libFLAC_static\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "flac"=.\src\flac\flac.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
diff --git a/FLAC.sln b/FLAC.sln
index a13ae6a..5655050 100644 (file)
--- a/FLAC.sln
+++ b/FLAC.sln
@@ -1,12 +1,23 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 9.00\r
 # Visual C++ Express 2005\r
-Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "example_c_decode_file", "example\c\decode\file\example_c_decode_file.vcproj", "{4cefbd00-c215-11db-8314-0800200c9a66}"\r
+Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "example_c_decode_file", "examples\c\decode\file\example_c_decode_file.vcproj", "{4cefbd00-c215-11db-8314-0800200c9a66}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66}\r
        EndProjectSection\r
 EndProject\r
-Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "example_cpp_decode_file", "example\cpp\decode\file\example_cpp_decode_file.vcproj", "{4cefbe00-c215-11db-8314-0800200c9a66}"\r
+Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "example_c_encode_file", "examples\c\encode\file\example_c_encode_file.vcproj", "{4cefbd01-c215-11db-8314-0800200c9a66}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66}\r
+       EndProjectSection\r
+EndProject\r
+Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "example_cpp_decode_file", "examples\cpp\decode\file\example_cpp_decode_file.vcproj", "{4cefbe00-c215-11db-8314-0800200c9a66}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66}\r
+               {4cefbc86-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66}\r
+       EndProjectSection\r
+EndProject\r
+Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "example_cpp_encode_file", "examples\cpp\encode\file\example_cpp_encode_file.vcproj", "{4cefbe01-c215-11db-8314-0800200c9a66}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66}\r
                {4cefbc86-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66}\r
@@ -220,21 +231,33 @@ Global
                {4cefbc92-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32\r
                {4cefbc92-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32\r
                {4cefbc93-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {4cefbc93-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {4cefbc93-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32\r
                {4cefbc93-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32\r
-               {4cefbc94-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32\r
+               {4cefbc93-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32\r
+               {4cefbc94-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {4cefbc94-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32\r
                {4cefbc94-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32\r
                {4cefbc94-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32\r
                {4cefbc95-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {4cefbc95-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {4cefbc95-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32\r
                {4cefbc95-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32\r
-               {4cefbd00-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4cefbc95-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32\r
                {4cefbd00-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {4cefbd00-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32\r
                {4cefbd00-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4cefbd00-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32\r
+               {4cefbd01-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4cefbd01-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4cefbd01-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4cefbd01-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32\r
+               {4cefbe00-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4cefbe00-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4cefbe00-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4cefbe00-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32\r
+               {4cefbe01-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4cefbe01-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4cefbe01-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4cefbe01-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
diff --git a/configure.in b/configure.in
index 7e4e2ef..a48e174 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -353,9 +353,13 @@ AC_CONFIG_FILES([ \
        examples/c/Makefile \
        examples/c/decode/Makefile \
        examples/c/decode/file/Makefile \
+       examples/c/encode/Makefile \
+       examples/c/encode/file/Makefile \
        examples/cpp/Makefile \
        examples/cpp/decode/Makefile \
        examples/cpp/decode/file/Makefile \
+       examples/cpp/encode/Makefile \
+       examples/cpp/encode/file/Makefile \
        include/Makefile \
        include/FLAC/Makefile \
        include/FLAC++/Makefile \
diff --git a/examples/Makefile.lite b/examples/Makefile.lite
index 48bdd2d..abfe657 100644 (file)
--- a/examples/Makefile.lite
+++ b/examples/Makefile.lite
@@ -15,8 +15,8 @@
 #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
 #  distribution.
 
-.PHONY: all example_c_decode_file example_cpp_decode_file
-all: example_c_decode_file example_cpp_decode_file
+.PHONY: all example_c_decode_file example_c_encode_file example_cpp_decode_file example_cpp_encode_file
+all: example_c_decode_file example_c_encode_file example_cpp_decode_file example_cpp_encode_file
 
 DEFAULT_CONFIG = release
 
@@ -33,9 +33,17 @@ release : all
 example_c_decode_file:
        (cd c/decode/file && $(MAKE) -f Makefile.lite $(CONFIG))
 
+example_c_encode_file:
+       (cd c/encode/file && $(MAKE) -f Makefile.lite $(CONFIG))
+
 example_cpp_decode_file:
        (cd cpp/decode/file && $(MAKE) -f Makefile.lite $(CONFIG))
 
+example_cpp_encode_file:
+       (cd cpp/encode/file && $(MAKE) -f Makefile.lite $(CONFIG))
+
 clean:
        -(cd c/decode/file && $(MAKE) -f Makefile.lite clean)
+       -(cd c/encode/file && $(MAKE) -f Makefile.lite clean)
        -(cd cpp/decode/file && $(MAKE) -f Makefile.lite clean)
+       -(cd cpp/encode/file && $(MAKE) -f Makefile.lite clean)
diff --git a/examples/README b/examples/README
index 2f30e64..0c51ff9 100644 (file)
--- a/examples/README
+++ b/examples/README
@@ -7,3 +7,6 @@ The "cpp" directory has analogous programs that are all in C++ and use libFLAC++
 
 The programs are:
 c/decode/file/ - example_c_decode_file - Simple FLAC file decoder using libFLAC
+c/encode/file/ - example_c_encode_file - Simple FLAC file encoder using libFLAC
+cpp/decode/file/ - example_cpp_decode_file - Simple FLAC file decoder using libFLAC++
+cpp/encode/file/ - example_cpp_encode_file - Simple FLAC file encoder using libFLAC++
diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am
index e657f9e..b88dca6 100644 (file)
--- a/examples/c/Makefile.am
+++ b/examples/c/Makefile.am
@@ -15,4 +15,4 @@
 #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
 #  distribution.
 
-SUBDIRS = decode
+SUBDIRS = decode encode
diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am
index e657f9e..b88dca6 100644 (file)
--- a/examples/cpp/Makefile.am
+++ b/examples/cpp/Makefile.am
@@ -15,4 +15,4 @@
 #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
 #  distribution.
 
-SUBDIRS = decode
+SUBDIRS = decode encode
Domain: Multimedia / Audio FW;