From 99b0c6e2f4431ee8414a4f35203a88fee5eb09fc Mon Sep 17 00:00:00 2001
From: Scott Wheeler <wheeler@kde.org>
Date: Thu, 27 Sep 2007 21:41:12 +0000
Subject: [PATCH] Note OGA as the new extension for Ogg FLAC.

(Note: for the bug report, this won't actually make things work in Amarok, in fact, this change
wasn't needed at all for it to work there.)

BUG:149987


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@717998 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 taglib/CMakeLists.txt | 1 +
 taglib/Makefile.am    | 1 +
 taglib/fileref.cpp    | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
index 87d49117..0fab9921 100644
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_SOURCE_DIR}/toolkit
     ${CMAKE_CURRENT_SOURCE_DIR}/mpeg
     ${CMAKE_CURRENT_SOURCE_DIR}/ogg
+    ${CMAKE_CURRENT_SOURCE_DIR}/ogg/flac
     ${CMAKE_CURRENT_SOURCE_DIR}/flac
     ${CMAKE_CURRENT_SOURCE_DIR}/mpc
     ${CMAKE_CURRENT_SOURCE_DIR}/ogg/vorbis
diff --git a/taglib/Makefile.am b/taglib/Makefile.am
index b6d51a93..0f5321ce 100644
--- a/taglib/Makefile.am
+++ b/taglib/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES = \
 	-I$(top_srcdir)/taglib/toolkit \
 	-I$(top_srcdir)/taglib/mpeg \
 	-I$(top_srcdir)/taglib/ogg \
+	-I$(top_srcdir)/taglib/ogg/flac \
 	-I$(top_srcdir)/taglib/flac \
 	-I$(top_srcdir)/taglib/mpc \
 	-I$(top_srcdir)/taglib/ogg/vorbis \
diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp
index afc19796..1b3a0c46 100644
--- a/taglib/fileref.cpp
+++ b/taglib/fileref.cpp
@@ -26,6 +26,7 @@
 #include "mpegfile.h"
 #include "vorbisfile.h"
 #include "flacfile.h"
+#include "oggflacfile.h"
 #include "mpcfile.h"
 
 using namespace TagLib;
@@ -107,6 +108,7 @@ StringList FileRef::defaultFileExtensions()
 
   l.append("ogg");
   l.append("flac");
+  l.append("oga");
   l.append("mp3");
   l.append("mpc");
 
@@ -167,6 +169,8 @@ File *FileRef::create(const char *fileName, bool readAudioProperties,
       return new Vorbis::File(fileName, readAudioProperties, audioPropertiesStyle);
     if(s.substr(s.size() - 4, 4).upper() == ".MP3")
       return new MPEG::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(s.substr(s.size() - 4, 4).upper() == ".OGA")
+      return new Ogg::FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
     if(s.substr(s.size() - 5, 5).upper() == ".FLAC")
       return new FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
     if(s.substr(s.size() - 4, 4).upper() == ".MPC")