Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add reading of FLAC files #256

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Add reading of FLAC files #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
846cb83
Insert empty wrapper around ZenLib::File for direct FLAC parsing
ktmf01 Mar 23, 2023
6862c3a
Enable reading of FLAC files with BWF metadata embedded
ktmf01 Mar 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Project/GNU/CLI/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ bwfmetaedit_SOURCES = \
../../../Source/Riff/Riff_Chunks_WAVE_CSET.cpp \
../../../Source/Riff/Riff_Handler.cpp \
../../../Source/TinyXml2/tinyxml2.cpp \
../../../Source/FLACwrapper/File.cpp \
../../../Source/ZenLib/Conf.cpp \
../../../Source/ZenLib/CriticalSection.cpp \
../../../Source/ZenLib/Dir.cpp \
Expand Down
5 changes: 5 additions & 0 deletions Project/GNU/CLI/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ dnl
CXXFLAGS="$CXXFLAGS -pthread"
LDFLAGS="$LDFLAGS -lpthread -pthread"

dnl -------------------------------------------------------------------------
dnl Use dlopen
dnl
LIBS="$LIBS -ldl"

dnl -------------------------------------------------------------------------
dnl Large files
dnl
Expand Down
34 changes: 17 additions & 17 deletions Source/Common/Core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "Common/Core.h"
#include "ZenLib/ZtringListList.h"
#include "ZenLib/Ztring.h"
#include "ZenLib/File.h"
#include "FLACwrapper/File.h"
#include "ZenLib/Dir.h"
#include "ZenLib/OS_Utils.h"
#include "Common/Common_About.h"
Expand Down Expand Up @@ -456,7 +456,7 @@ float Core::Menu_File_Open_Files_Finish_Middle ()
File_Name=Ztring().From_UTF8(Handler->second.In_cue__FileName);

Ztring Value;
File F;
FLACwrapper::File F;
int64u F_Size;

if (!F.Open(File_Name))
Expand Down Expand Up @@ -734,7 +734,7 @@ string Core::Menu_File_Undo_ListModifiedFiles(size_t Pos)
Ztring FileName=BackupFiles[Pos];

//Opening the file
File F;
FLACwrapper::File F;
if (!F.Open(FileName))
return string();
int64u F_Size=F.Size_Get();
Expand Down Expand Up @@ -976,7 +976,7 @@ int Core::Menu_File_Import_Core(const string &FileName)
try
{
//Checking if file exists
File In_Bext_File;
FLACwrapper::File In_Bext_File;
if (!In_Bext_File.Open(Ztring().From_UTF8(FileName)))
throw "--in-core=: file does not exist";
int64u File_Size=In_Bext_File.Size_Get();
Expand Down Expand Up @@ -1603,7 +1603,7 @@ void Core::Batch_Finish()
{
try
{
File F;
FLACwrapper::File F;
if (!F.Create(Ztring().From_UTF8(Out_XML_FileName)))
throw "--out-XML: error during file creation";
if (!F.Write(Ztring().From_UTF8(Out_XML_Buf)))
Expand Down Expand Up @@ -1896,7 +1896,7 @@ void Core::Batch_Launch_PMX(handlers::iterator &Handler)
{
try
{
File F;
FLACwrapper::File F;
if (!F.Create(Ztring().From_UTF8(Handler->second.Riff->FileName_Get())+__T(".XMP.xml")))
throw "--out-XMP-XML: error during file creation";
if (!F.Write(Ztring().From_UTF8(Content)))
Expand All @@ -1913,7 +1913,7 @@ void Core::Batch_Launch_PMX(handlers::iterator &Handler)
{
try
{
File F;
FLACwrapper::File F;
if (!F.Create(Ztring().From_UTF8(Out__PMX_FileName.c_str())))
throw "--out-XMP=: error during file creation";
if (!F.Write(Ztring().From_UTF8(Content)))
Expand Down Expand Up @@ -1959,7 +1959,7 @@ void Core::Batch_Launch_aXML(handlers::iterator &Handler)
{
try
{
File F;
FLACwrapper::File F;
if (!F.Create(Ztring().From_UTF8(Handler->second.Riff->FileName_Get())+__T(".aXML.xml")))
throw "--out-aXML-XML: error during file creation";
if (!F.Write(Ztring().From_UTF8(Content)))
Expand All @@ -1976,7 +1976,7 @@ void Core::Batch_Launch_aXML(handlers::iterator &Handler)
{
try
{
File F;
FLACwrapper::File F;
if (!F.Create(Ztring().From_UTF8(Out_aXML_FileName.c_str())))
throw "--out-aXML=: error during file creation";
if (!F.Write(Ztring().From_UTF8(Content)))
Expand Down Expand Up @@ -2020,7 +2020,7 @@ void Core::Batch_Launch_iXML(handlers::iterator &Handler)
{
try
{
File F;
FLACwrapper::File F;
if (!F.Create(Ztring().From_UTF8(Handler->second.Riff->FileName_Get())+__T(".iXML.xml")))
throw "--out-iXML-XML: error during file creation";
if (!F.Write(Ztring().From_UTF8(Content)))
Expand All @@ -2037,7 +2037,7 @@ void Core::Batch_Launch_iXML(handlers::iterator &Handler)
{
try
{
File F;
FLACwrapper::File F;
if (!F.Create(Ztring().From_UTF8(Out_iXML_FileName.c_str())))
throw "--out-iXML=: error during file creation";
if (!F.Write(Ztring().From_UTF8(Content)))
Expand Down Expand Up @@ -2082,7 +2082,7 @@ void Core::Batch_Launch_cue_(handlers::iterator &Handler)
//Saving file
try
{
File F;
FLACwrapper::File F;
if (!F.Create(Ztring().From_UTF8(Handler->second.Riff->FileName_Get())+__T(".cue.xml")))
throw "--out-cue-XML: error during file creation";
if (!F.Write(Content))
Expand All @@ -2099,7 +2099,7 @@ void Core::Batch_Launch_cue_(handlers::iterator &Handler)
{
try
{
File F;
FLACwrapper::File F;
if (!F.Create(Ztring().From_UTF8(Out_cue__FileName.c_str())))
throw "--out-cue=: error during file creation";
if (!F.Write(Content))
Expand Down Expand Up @@ -2210,7 +2210,7 @@ void Core::StdAll(handlers::iterator &Handler)
Data+=TimeS;
Data+=__T(" ");
Data+=Ztring().From_UTF8(Handler->second.Riff->Information.str());
File F(LogFile, File::Access_Write_Append);
FLACwrapper::File F(LogFile, File::Access_Write_Append);
F.Write(Data);
}
Handler->second.Riff->Information.str(string());
Expand All @@ -2225,7 +2225,7 @@ void Core::StdAll(handlers::iterator &Handler)
Data+=TimeS;
Data+=__T(" ");
Data+=Ztring().From_UTF8(Handler->second.Riff->Warnings.str());
File F(LogFile, File::Access_Write_Append);
FLACwrapper::File F(LogFile, File::Access_Write_Append);
F.Write(Data);
}
Handler->second.Riff->Warnings.str(string());
Expand All @@ -2240,7 +2240,7 @@ void Core::StdAll(handlers::iterator &Handler)
Data+=TimeS;
Data+=__T(" ");
Data+=Ztring().From_UTF8(Handler->second.Riff->Errors.str());
File F(LogFile, File::Access_Write_Append);
FLACwrapper::File F(LogFile, File::Access_Write_Append);
F.Write(Data);
}
Handler->second.Riff->Errors.str(string());
Expand All @@ -2266,7 +2266,7 @@ void Core::StdOut(string Text)
Data+=__T(" ");
Data+=Ztring().From_UTF8(Text);
Data+=EOL;
File F(LogFile, File::Access_Write_Append);
FLACwrapper::File F(LogFile, File::Access_Write_Append);
F.Write(Data);
}
}
Expand Down
Loading