GNOME.org
 

[easytag/wip/application-window] Move tagging code to new subdirectory

commit f96d7c4b14dad95cf3250e306e3c53bd0ea5a10d
Author: David King <amigadave amigadave com>
Date:   Sat Aug 9 19:11:24 2014 +0100

    Move tagging code to new subdirectory
    
    Rearranging the tagging code will make it easier to split the code off
    to be a separate library.

 .gitignore                                         |    5 +-
 Makefile.am                                        |  102 ++++++++++----------
 po/POTFILES.in                                     |   32 +++---
 src/{ => tags}/ape_tag.c                           |    0
 src/{ => tags}/ape_tag.h                           |    0
 src/{ => tags}/flac_header.c                       |    0
 src/{ => tags}/flac_header.h                       |    0
 src/{ => tags}/flac_tag.c                          |    0
 src/{ => tags}/flac_tag.h                          |    0
 src/{ => tags}/gio_wrapper.cc                      |    0
 src/{ => tags}/gio_wrapper.h                       |    0
 src/{ => tags}/id3_tag.c                           |    0
 src/{ => tags}/id3_tag.h                           |    0
 src/{ => tags}/id3lib/c_wrapper.cpp                |    0
 src/{ => tags}/id3lib/id3_bugfix.h                 |    0
 .../patch_id3lib_3.8.3_UTF16_writing_bug.diff      |    0
 src/{ => tags}/id3v24_tag.c                        |    0
 src/{ => tags}/libapetag/COPYING.LGPL              |    0
 src/{ => tags}/libapetag/README.apetag             |    0
 src/{ => tags}/libapetag/apetaglib.c               |    0
 src/{ => tags}/libapetag/apetaglib.h               |    0
 src/{ => tags}/libapetag/id3v2_read.c              |    0
 src/{ => tags}/libapetag/id3v2_read.h              |    0
 src/{ => tags}/libapetag/info_mac.c                |    0
 src/{ => tags}/libapetag/info_mac.h                |    0
 src/{ => tags}/libapetag/info_mpc.c                |    0
 src/{ => tags}/libapetag/info_mpc.h                |    0
 src/{ => tags}/libapetag/is_tag.c                  |    0
 src/{ => tags}/libapetag/is_tag.h                  |    0
 src/{ => tags}/monkeyaudio_header.c                |    0
 src/{ => tags}/monkeyaudio_header.h                |    0
 src/{ => tags}/mp4_header.cc                       |    0
 src/{ => tags}/mp4_header.h                        |    0
 src/{ => tags}/mp4_tag.cc                          |    0
 src/{ => tags}/mp4_tag.h                           |    0
 src/{ => tags}/mpeg_header.c                       |    0
 src/{ => tags}/mpeg_header.h                       |    0
 src/{ => tags}/musepack_header.c                   |    0
 src/{ => tags}/musepack_header.h                   |    0
 src/{ => tags}/ogg_header.c                        |    0
 src/{ => tags}/ogg_header.h                        |    0
 src/{ => tags}/ogg_tag.c                           |    0
 src/{ => tags}/ogg_tag.h                           |    0
 src/{ => tags}/opus_header.c                       |    0
 src/{ => tags}/opus_header.h                       |    0
 src/{ => tags}/opus_tag.c                          |    0
 src/{ => tags}/opus_tag.h                          |    0
 src/{ => tags}/vcedit.c                            |    0
 src/{ => tags}/vcedit.h                            |    0
 src/{ => tags}/wavpack_header.c                    |    0
 src/{ => tags}/wavpack_header.h                    |    0
 src/{ => tags}/wavpack_tag.c                       |    0
 src/{ => tags}/wavpack_tag.h                       |    0
 53 files changed, 71 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f6c5441..767dc12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,8 +45,9 @@ configure
 /po/easytag.pot
 /po/stamp-it
 /src/.deps/
-/src/id3lib/.deps/
-/src/libapetag/.deps/
+/src/tags/id3lib/.deps/
+/src/tags/libapetag/.deps/
+/src/tags/.deps/
 /src/win32/.deps/
 /src/win32/easytag.rc
 /src/enums.c
diff --git a/Makefile.am b/Makefile.am
index 4569b62..532fa1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,8 @@ bin_PROGRAMS = easytag
 localedir = $(prefix)/$(DATADIRNAME)/locale
 easytag_CPPFLAGS = \
        -I$(top_srcdir) \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/tags \
        -I$(top_builddir) \
        -I$(top_builddir)/src \
        $(DEPRECATED_CPPFLAGS) \
@@ -35,13 +37,7 @@ easytag_CXXFLAGS = \
        $(EASYTAG_CFLAGS)
 
 easytag_SOURCES = \
-       src/id3lib/c_wrapper.cpp \
-       src/libapetag/apetaglib.c \
-       src/libapetag/is_tag.c \
-       src/libapetag/info_mac.c \
-       src/libapetag/info_mpc.c \
        src/about.c \
-       src/ape_tag.c \
        src/application.c \
        src/application_window.c \
        src/bar.c \
@@ -55,24 +51,11 @@ easytag_SOURCES = \
        src/enums.c \
        src/et_core.c \
        src/file_area.c \
-       src/flac_header.c \
-       src/flac_tag.c \
-       src/gio_wrapper.cc \
        src/gtk2_compat.c \
-       src/id3_tag.c \
-       src/id3v24_tag.c \
        src/load_files_dialog.c \
        src/log.c \
        src/main.c \
        src/misc.c \
-       src/monkeyaudio_header.c \
-       src/mpeg_header.c \
-       src/mp4_tag.cc \
-       src/musepack_header.c \
-       src/ogg_header.c \
-       src/ogg_tag.c \
-       src/opus_header.c \
-       src/opus_tag.c \
        src/picture.c \
        src/playlist_dialog.c \
        src/preferences_dialog.c \
@@ -81,22 +64,35 @@ easytag_SOURCES = \
        src/search_dialog.c \
        src/setting.c \
        src/tag_area.c \
-       src/vcedit.c \
-       src/wavpack_header.c \
-       src/wavpack_tag.c \
+       src/tags/id3lib/c_wrapper.cpp \
+       src/tags/libapetag/apetaglib.c \
+       src/tags/libapetag/is_tag.c \
+       src/tags/libapetag/info_mac.c \
+       src/tags/libapetag/info_mpc.c \
+       src/tags/ape_tag.c \
+       src/tags/flac_header.c \
+       src/tags/flac_tag.c \
+       src/tags/gio_wrapper.cc \
+       src/tags/id3_tag.c \
+       src/tags/id3v24_tag.c \
+       src/tags/monkeyaudio_header.c \
+       src/tags/mpeg_header.c \
+       src/tags/mp4_tag.cc \
+       src/tags/musepack_header.c \
+       src/tags/ogg_header.c \
+       src/tags/ogg_tag.c \
+       src/tags/opus_header.c \
+       src/tags/opus_tag.c \
+       src/tags/vcedit.c \
+       src/tags/wavpack_header.c \
+       src/tags/wavpack_tag.c \
        src/win32/win32dep.c
 
 nodist_easytag_SOURCES = \
        src/resource.c
 
 easytag_headers = \
-       src/id3lib/id3_bugfix.h \
-       src/libapetag/apetaglib.h \
-       src/libapetag/is_tag.h \
-       src/libapetag/info_mac.h \
-       src/libapetag/info_mpc.h \
        src/about.h \
-       src/ape_tag.h \
        src/application.h \
        src/application_window.h \
        src/bar.h \
@@ -107,24 +103,11 @@ easytag_headers = \
        src/easytag.h \
        src/et_core.h \
        src/file_area.h \
-       src/flac_header.h \
-       src/flac_tag.h \
        src/genres.h \
-       src/gio_wrapper.h \
        src/gtk2_compat.h \
-       src/id3_tag.h \
        src/load_files_dialog.h \
        src/log.h \
        src/misc.h \
-       src/monkeyaudio_header.h \
-       src/mpeg_header.h \
-       src/mp4_header.h \
-       src/mp4_tag.h \
-       src/musepack_header.h \
-       src/ogg_header.h \
-       src/ogg_tag.h \
-       src/opus_header.h \
-       src/opus_tag.h \
        src/picture.h \
        src/playlist_dialog.h \
        src/preferences_dialog.h \
@@ -133,9 +116,28 @@ easytag_headers = \
        src/search_dialog.h \
        src/setting.h \
        src/tag_area.h \
-       src/vcedit.h \
-       src/wavpack_header.h \
-       src/wavpack_tag.h \
+       src/tags/id3lib/id3_bugfix.h \
+       src/tags/libapetag/apetaglib.h \
+       src/tags/libapetag/is_tag.h \
+       src/tags/libapetag/info_mac.h \
+       src/tags/libapetag/info_mpc.h \
+       src/tags/ape_tag.h \
+       src/tags/flac_header.h \
+       src/tags/flac_tag.h \
+       src/tags/gio_wrapper.h \
+       src/tags/id3_tag.h \
+       src/tags/monkeyaudio_header.h \
+       src/tags/mpeg_header.h \
+       src/tags/mp4_header.h \
+       src/tags/mp4_tag.h \
+       src/tags/musepack_header.h \
+       src/tags/ogg_header.h \
+       src/tags/ogg_tag.h \
+       src/tags/opus_header.h \
+       src/tags/opus_tag.h \
+       src/tags/vcedit.h \
+       src/tags/wavpack_header.h \
+       src/tags/wavpack_tag.h \
        src/win32/win32dep.h
 
 nodist_easytag_headers = \
@@ -343,12 +345,12 @@ dist_noinst_DATA = \
        $(easytag_headers) \
        data/org.gnome.EasyTAG.gresource.xml \
        $(noinst_resource_files) \
-       src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff \
-       src/libapetag/COPYING.LGPL \
-       src/libapetag/README.apetag \
-       src/libapetag/id3v2_read.c \
-       src/libapetag/id3v2_read.h \
-       src/mp4_header.cc \
+       src/tags/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff \
+       src/tags/libapetag/COPYING.LGPL \
+       src/tags/libapetag/README.apetag \
+       src/tags/libapetag/id3v2_read.c \
+       src/tags/libapetag/id3v2_read.h \
+       src/tags/mp4_header.cc \
        src/win32/resource.h \
        data/icons/win32/easytag.ico \
        data/nsis/easytag-header.bmp \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e6c697b..1c727bc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,6 @@ data/easytag.desktop.in
 data/org.gnome.EasyTAG.gschema.xml
 nautilus-extension/nautilus-easytag.c
 src/about.c
-src/ape_tag.c
 src/application.c
 src/application_window.c
 src/bar.c
@@ -15,21 +14,9 @@ src/charset.c
 src/easytag.c
 src/et_core.c
 src/file_area.c
-src/flac_header.c
-src/flac_tag.c
-src/id3_tag.c
-src/id3v24_tag.c
 src/load_files_dialog.c
 src/log.c
 src/misc.c
-src/monkeyaudio_header.c
-src/mp4_header.cc
-src/mp4_tag.cc
-src/mpeg_header.c
-src/musepack_header.c
-src/ogg_header.c
-src/ogg_tag.c
-src/opus_header.c
 src/picture.c
 src/playlist_dialog.c
 src/preferences_dialog.c
@@ -37,7 +24,20 @@ src/scan_dialog.c
 src/search_dialog.c
 src/setting.c
 src/tag_area.c
-src/vcedit.c
-src/wavpack_header.c
-src/wavpack_tag.c
+src/tags/ape_tag.c
+src/tags/flac_header.c
+src/tags/flac_tag.c
+src/tags/id3_tag.c
+src/tags/id3v24_tag.c
+src/tags/monkeyaudio_header.c
+src/tags/mp4_header.cc
+src/tags/mp4_tag.cc
+src/tags/mpeg_header.c
+src/tags/musepack_header.c
+src/tags/ogg_header.c
+src/tags/ogg_tag.c
+src/tags/opus_header.c
+src/tags/vcedit.c
+src/tags/wavpack_header.c
+src/tags/wavpack_tag.c
 src/win32/win32dep.c
diff --git a/src/ape_tag.c b/src/tags/ape_tag.c
similarity index 100%
rename from src/ape_tag.c
rename to src/tags/ape_tag.c
diff --git a/src/ape_tag.h b/src/tags/ape_tag.h
similarity index 100%
rename from src/ape_tag.h
rename to src/tags/ape_tag.h
diff --git a/src/flac_header.c b/src/tags/flac_header.c
similarity index 100%
rename from src/flac_header.c
rename to src/tags/flac_header.c
diff --git a/src/flac_header.h b/src/tags/flac_header.h
similarity index 100%
rename from src/flac_header.h
rename to src/tags/flac_header.h
diff --git a/src/flac_tag.c b/src/tags/flac_tag.c
similarity index 100%
rename from src/flac_tag.c
rename to src/tags/flac_tag.c
diff --git a/src/flac_tag.h b/src/tags/flac_tag.h
similarity index 100%
rename from src/flac_tag.h
rename to src/tags/flac_tag.h
diff --git a/src/gio_wrapper.cc b/src/tags/gio_wrapper.cc
similarity index 100%
rename from src/gio_wrapper.cc
rename to src/tags/gio_wrapper.cc
diff --git a/src/gio_wrapper.h b/src/tags/gio_wrapper.h
similarity index 100%
rename from src/gio_wrapper.h
rename to src/tags/gio_wrapper.h
diff --git a/src/id3_tag.c b/src/tags/id3_tag.c
similarity index 100%
rename from src/id3_tag.c
rename to src/tags/id3_tag.c
diff --git a/src/id3_tag.h b/src/tags/id3_tag.h
similarity index 100%
rename from src/id3_tag.h
rename to src/tags/id3_tag.h
diff --git a/src/id3lib/c_wrapper.cpp b/src/tags/id3lib/c_wrapper.cpp
similarity index 100%
rename from src/id3lib/c_wrapper.cpp
rename to src/tags/id3lib/c_wrapper.cpp
diff --git a/src/id3lib/id3_bugfix.h b/src/tags/id3lib/id3_bugfix.h
similarity index 100%
rename from src/id3lib/id3_bugfix.h
rename to src/tags/id3lib/id3_bugfix.h
diff --git a/src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff 
b/src/tags/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
similarity index 100%
rename from src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
rename to src/tags/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
diff --git a/src/id3v24_tag.c b/src/tags/id3v24_tag.c
similarity index 100%
rename from src/id3v24_tag.c
rename to src/tags/id3v24_tag.c
diff --git a/src/libapetag/COPYING.LGPL b/src/tags/libapetag/COPYING.LGPL
similarity index 100%
rename from src/libapetag/COPYING.LGPL
rename to src/tags/libapetag/COPYING.LGPL
diff --git a/src/libapetag/README.apetag b/src/tags/libapetag/README.apetag
similarity index 100%
rename from src/libapetag/README.apetag
rename to src/tags/libapetag/README.apetag
diff --git a/src/libapetag/apetaglib.c b/src/tags/libapetag/apetaglib.c
similarity index 100%
rename from src/libapetag/apetaglib.c
rename to src/tags/libapetag/apetaglib.c
diff --git a/src/libapetag/apetaglib.h b/src/tags/libapetag/apetaglib.h
similarity index 100%
rename from src/libapetag/apetaglib.h
rename to src/tags/libapetag/apetaglib.h
diff --git a/src/libapetag/id3v2_read.c b/src/tags/libapetag/id3v2_read.c
similarity index 100%
rename from src/libapetag/id3v2_read.c
rename to src/tags/libapetag/id3v2_read.c
diff --git a/src/libapetag/id3v2_read.h b/src/tags/libapetag/id3v2_read.h
similarity index 100%
rename from src/libapetag/id3v2_read.h
rename to src/tags/libapetag/id3v2_read.h
diff --git a/src/libapetag/info_mac.c b/src/tags/libapetag/info_mac.c
similarity index 100%
rename from src/libapetag/info_mac.c
rename to src/tags/libapetag/info_mac.c
diff --git a/src/libapetag/info_mac.h b/src/tags/libapetag/info_mac.h
similarity index 100%
rename from src/libapetag/info_mac.h
rename to src/tags/libapetag/info_mac.h
diff --git a/src/libapetag/info_mpc.c b/src/tags/libapetag/info_mpc.c
similarity index 100%
rename from src/libapetag/info_mpc.c
rename to src/tags/libapetag/info_mpc.c
diff --git a/src/libapetag/info_mpc.h b/src/tags/libapetag/info_mpc.h
similarity index 100%
rename from src/libapetag/info_mpc.h
rename to src/tags/libapetag/info_mpc.h
diff --git a/src/libapetag/is_tag.c b/src/tags/libapetag/is_tag.c
similarity index 100%
rename from src/libapetag/is_tag.c
rename to src/tags/libapetag/is_tag.c
diff --git a/src/libapetag/is_tag.h b/src/tags/libapetag/is_tag.h
similarity index 100%
rename from src/libapetag/is_tag.h
rename to src/tags/libapetag/is_tag.h
diff --git a/src/monkeyaudio_header.c b/src/tags/monkeyaudio_header.c
similarity index 100%
rename from src/monkeyaudio_header.c
rename to src/tags/monkeyaudio_header.c
diff --git a/src/monkeyaudio_header.h b/src/tags/monkeyaudio_header.h
similarity index 100%
rename from src/monkeyaudio_header.h
rename to src/tags/monkeyaudio_header.h
diff --git a/src/mp4_header.cc b/src/tags/mp4_header.cc
similarity index 100%
rename from src/mp4_header.cc
rename to src/tags/mp4_header.cc
diff --git a/src/mp4_header.h b/src/tags/mp4_header.h
similarity index 100%
rename from src/mp4_header.h
rename to src/tags/mp4_header.h
diff --git a/src/mp4_tag.cc b/src/tags/mp4_tag.cc
similarity index 100%
rename from src/mp4_tag.cc
rename to src/tags/mp4_tag.cc
diff --git a/src/mp4_tag.h b/src/tags/mp4_tag.h
similarity index 100%
rename from src/mp4_tag.h
rename to src/tags/mp4_tag.h
diff --git a/src/mpeg_header.c b/src/tags/mpeg_header.c
similarity index 100%
rename from src/mpeg_header.c
rename to src/tags/mpeg_header.c
diff --git a/src/mpeg_header.h b/src/tags/mpeg_header.h
similarity index 100%
rename from src/mpeg_header.h
rename to src/tags/mpeg_header.h
diff --git a/src/musepack_header.c b/src/tags/musepack_header.c
similarity index 100%
rename from src/musepack_header.c
rename to src/tags/musepack_header.c
diff --git a/src/musepack_header.h b/src/tags/musepack_header.h
similarity index 100%
rename from src/musepack_header.h
rename to src/tags/musepack_header.h
diff --git a/src/ogg_header.c b/src/tags/ogg_header.c
similarity index 100%
rename from src/ogg_header.c
rename to src/tags/ogg_header.c
diff --git a/src/ogg_header.h b/src/tags/ogg_header.h
similarity index 100%
rename from src/ogg_header.h
rename to src/tags/ogg_header.h
diff --git a/src/ogg_tag.c b/src/tags/ogg_tag.c
similarity index 100%
rename from src/ogg_tag.c
rename to src/tags/ogg_tag.c
diff --git a/src/ogg_tag.h b/src/tags/ogg_tag.h
similarity index 100%
rename from src/ogg_tag.h
rename to src/tags/ogg_tag.h
diff --git a/src/opus_header.c b/src/tags/opus_header.c
similarity index 100%
rename from src/opus_header.c
rename to src/tags/opus_header.c
diff --git a/src/opus_header.h b/src/tags/opus_header.h
similarity index 100%
rename from src/opus_header.h
rename to src/tags/opus_header.h
diff --git a/src/opus_tag.c b/src/tags/opus_tag.c
similarity index 100%
rename from src/opus_tag.c
rename to src/tags/opus_tag.c
diff --git a/src/opus_tag.h b/src/tags/opus_tag.h
similarity index 100%
rename from src/opus_tag.h
rename to src/tags/opus_tag.h
diff --git a/src/vcedit.c b/src/tags/vcedit.c
similarity index 100%
rename from src/vcedit.c
rename to src/tags/vcedit.c
diff --git a/src/vcedit.h b/src/tags/vcedit.h
similarity index 100%
rename from src/vcedit.h
rename to src/tags/vcedit.h
diff --git a/src/wavpack_header.c b/src/tags/wavpack_header.c
similarity index 100%
rename from src/wavpack_header.c
rename to src/tags/wavpack_header.c
diff --git a/src/wavpack_header.h b/src/tags/wavpack_header.h
similarity index 100%
rename from src/wavpack_header.h
rename to src/tags/wavpack_header.h
diff --git a/src/wavpack_tag.c b/src/tags/wavpack_tag.c
similarity index 100%
rename from src/wavpack_tag.c
rename to src/tags/wavpack_tag.c
diff --git a/src/wavpack_tag.h b/src/tags/wavpack_tag.h
similarity index 100%
rename from src/wavpack_tag.h
rename to src/tags/wavpack_tag.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]