summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-01-08 19:43:09 +0100
committerMax Kellermann <max@duempel.org>2014-01-08 19:48:55 +0100
commitac1983eae32caa7c6f10ec4bab32a9657bdb2668 (patch)
tree5139b83e3bef91741750f83dcdd9fea9f8304e7a /src
parent33c5fc95b4281520fd54c76e4f898d8256b333f7 (diff)
tag/TagBuilder: rename Commit() to CommitNew()
Diffstat (limited to 'src')
-rw-r--r--src/DespotifyUtils.cxx2
-rw-r--r--src/IcyMetaDataParser.cxx2
-rw-r--r--src/PlaylistTag.cxx4
-rw-r--r--src/SongSave.cxx2
-rw-r--r--src/SongUpdate.cxx6
-rw-r--r--src/UpdateContainer.cxx2
-rw-r--r--src/cue/CueParser.cxx2
-rw-r--r--src/db/ProxyDatabasePlugin.cxx2
-rw-r--r--src/decoder/VorbisComments.cxx2
-rw-r--r--src/input/CurlInputPlugin.cxx2
-rw-r--r--src/playlist/AsxPlaylistPlugin.cxx2
-rw-r--r--src/playlist/ExtM3uPlaylistPlugin.cxx2
-rw-r--r--src/playlist/PlsPlaylistPlugin.cxx2
-rw-r--r--src/playlist/RssPlaylistPlugin.cxx2
-rw-r--r--src/playlist/SoundCloudPlaylistPlugin.cxx2
-rw-r--r--src/playlist/XspfPlaylistPlugin.cxx2
-rw-r--r--src/tag/Tag.cxx2
-rw-r--r--src/tag/TagBuilder.cxx2
-rw-r--r--src/tag/TagBuilder.hxx2
-rw-r--r--src/tag/TagId3.cxx2
20 files changed, 23 insertions, 23 deletions
diff --git a/src/DespotifyUtils.cxx b/src/DespotifyUtils.cxx
index 5bfcfd6a4..c2e88b013 100644
--- a/src/DespotifyUtils.cxx
+++ b/src/DespotifyUtils.cxx
@@ -108,7 +108,7 @@ mpd_despotify_tag_from_track(struct ds_track *track)
tag.AddItem(TAG_COMMENT, comment);
tag.SetTime(track->length / 1000);
- return tag.Commit();
+ return tag.CommitNew();
}
struct despotify_session *mpd_despotify_get_session(void)
diff --git a/src/IcyMetaDataParser.cxx b/src/IcyMetaDataParser.cxx
index 5444db8d9..02c0fdc1e 100644
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@@ -109,7 +109,7 @@ icy_parse_tag(const char *p)
g_strfreev(items);
- return tag.Commit();
+ return tag.CommitNew();
}
size_t
diff --git a/src/PlaylistTag.cxx b/src/PlaylistTag.cxx
index e158018f5..2897f3252 100644
--- a/src/PlaylistTag.cxx
+++ b/src/PlaylistTag.cxx
@@ -56,7 +56,7 @@ playlist::AddSongIdTag(unsigned id, TagType tag_type, const char *value,
}
tag.AddItem(tag_type, value);
- song.tag = tag.Commit();
+ song.tag = tag.CommitNew();
queue.ModifyAtPosition(position);
OnModified();
@@ -91,7 +91,7 @@ playlist::ClearSongIdTag(unsigned id, TagType tag_type,
tag.RemoveAll();
else
tag.RemoveType(tag_type);
- song.tag = tag.Commit();
+ song.tag = tag.CommitNew();
queue.ModifyAtPosition(position);
OnModified();
diff --git a/src/SongSave.cxx b/src/SongSave.cxx
index 9682bf650..c2e3afce5 100644
--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@@ -104,7 +104,7 @@ song_load(TextFile &file, Directory *parent, const char *uri,
}
if (tag.IsDefined())
- song->tag = tag.Commit();
+ song->tag = tag.CommitNew();
return song;
}
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index aef484a6f..fe78e1e0f 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -100,7 +100,7 @@ Song::UpdateFile()
mtime = st.st_mtime;
delete tag;
- tag = tag_builder.Commit();
+ tag = tag_builder.CommitNew();
return true;
}
@@ -129,7 +129,7 @@ Song::UpdateFileInArchive()
return false;
delete tag;
- tag = tag_builder.Commit();
+ tag = tag_builder.CommitNew();
return true;
}
@@ -143,6 +143,6 @@ Song::UpdateStream()
return false;
delete tag;
- tag = tag_builder.Commit();
+ tag = tag_builder.CommitNew();
return true;
}
diff --git a/src/UpdateContainer.cxx b/src/UpdateContainer.cxx
index c970dc05c..5b1fa2376 100644
--- a/src/UpdateContainer.cxx
+++ b/src/UpdateContainer.cxx
@@ -114,7 +114,7 @@ update_container_file(Directory &directory,
add_tag_handler, &tag_builder);
if (tag_builder.IsDefined())
- song->tag = tag_builder.Commit();
+ song->tag = tag_builder.CommitNew();
else
tag_builder.Clear();
diff --git a/src/cue/CueParser.cxx b/src/cue/CueParser.cxx
index b9927f5e2..4a4f823ab 100644
--- a/src/cue/CueParser.cxx
+++ b/src/cue/CueParser.cxx
@@ -170,7 +170,7 @@ CueParser::Commit()
return;
assert(current->tag == nullptr);
- current->tag = song_tag.Commit();
+ current->tag = song_tag.CommitNew();
finished = previous;
previous = current;
diff --git a/src/db/ProxyDatabasePlugin.cxx b/src/db/ProxyDatabasePlugin.cxx
index a4fa88edd..3b0f4b4f0 100644
--- a/src/db/ProxyDatabasePlugin.cxx
+++ b/src/db/ProxyDatabasePlugin.cxx
@@ -406,7 +406,7 @@ Convert(const struct mpd_song *song)
for (const auto *i = &tag_table[0]; i->d != TAG_NUM_OF_ITEM_TYPES; ++i)
Copy(tag, i->d, song, i->s);
- s->tag = tag.Commit();
+ s->tag = tag.CommitNew();
return s;
}
diff --git a/src/decoder/VorbisComments.cxx b/src/decoder/VorbisComments.cxx
index 2adc498d5..e6a99ca6b 100644
--- a/src/decoder/VorbisComments.cxx
+++ b/src/decoder/VorbisComments.cxx
@@ -137,5 +137,5 @@ vorbis_comments_to_tag(char **comments)
vorbis_comments_scan(comments, &add_tag_handler, &tag_builder);
return tag_builder.IsEmpty()
? nullptr
- : tag_builder.Commit();
+ : tag_builder.CommitNew();
}
diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx
index 3b73597de..0318d5a5f 100644
--- a/src/input/CurlInputPlugin.cxx
+++ b/src/input/CurlInputPlugin.cxx
@@ -915,7 +915,7 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream)
TagBuilder tag_builder;
tag_builder.AddItem(TAG_NAME, c->meta_name.c_str());
- c->tag = tag_builder.Commit();
+ c->tag = tag_builder.CommitNew();
} else if (StringEqualsCaseASCII(name, "icy-metaint")) {
char buffer[64];
size_t icy_metaint;
diff --git a/src/playlist/AsxPlaylistPlugin.cxx b/src/playlist/AsxPlaylistPlugin.cxx
index 47983358a..ccd98a711 100644
--- a/src/playlist/AsxPlaylistPlugin.cxx
+++ b/src/playlist/AsxPlaylistPlugin.cxx
@@ -144,7 +144,7 @@ asx_end_element(gcc_unused GMarkupParseContext *context,
if (StringEqualsCaseASCII(element_name, "entry")) {
if (strcmp(parser->song->uri, "asx:") != 0) {
assert(parser->song->tag == nullptr);
- parser->song->tag = parser->tag_builder.Commit();
+ parser->song->tag = parser->tag_builder.CommitNew();
parser->songs.emplace_front(parser->song);
} else
parser->song->Free();
diff --git a/src/playlist/ExtM3uPlaylistPlugin.cxx b/src/playlist/ExtM3uPlaylistPlugin.cxx
index d48db1ed2..4f0c111ad 100644
--- a/src/playlist/ExtM3uPlaylistPlugin.cxx
+++ b/src/playlist/ExtM3uPlaylistPlugin.cxx
@@ -98,7 +98,7 @@ extm3u_parse_tag(const char *line)
if (*name != 0)
tag.AddItem(TAG_NAME, name);
- return tag.Commit();
+ return tag.CommitNew();
}
Song *
diff --git a/src/playlist/PlsPlaylistPlugin.cxx b/src/playlist/PlsPlaylistPlugin.cxx
index 329bd8bfb..046a9f8c8 100644
--- a/src/playlist/PlsPlaylistPlugin.cxx
+++ b/src/playlist/PlsPlaylistPlugin.cxx
@@ -100,7 +100,7 @@ pls_parser(GKeyFile *keyfile, std::forward_list<SongPointer> &songs)
if(error) g_error_free(error);
error = nullptr;
- song->tag = tag.Commit();
+ song->tag = tag.CommitNew();
songs.emplace_front(song);
num_entries--;
}
diff --git a/src/playlist/RssPlaylistPlugin.cxx b/src/playlist/RssPlaylistPlugin.cxx
index 62f636126..c4dd2f8c3 100644
--- a/src/playlist/RssPlaylistPlugin.cxx
+++ b/src/playlist/RssPlaylistPlugin.cxx
@@ -142,7 +142,7 @@ rss_end_element(gcc_unused GMarkupParseContext *context,
if (StringEqualsCaseASCII(element_name, "item")) {
if (strcmp(parser->song->uri, "rss:") != 0) {
assert(parser->song->tag == nullptr);
- parser->song->tag = parser->tag_builder.Commit();
+ parser->song->tag = parser->tag_builder.CommitNew();
parser->songs.emplace_front(parser->song);
} else
parser->song->Free();
diff --git a/src/playlist/SoundCloudPlaylistPlugin.cxx b/src/playlist/SoundCloudPlaylistPlugin.cxx
index fa2712dad..cfbd0e8b5 100644
--- a/src/playlist/SoundCloudPlaylistPlugin.cxx
+++ b/src/playlist/SoundCloudPlaylistPlugin.cxx
@@ -221,7 +221,7 @@ handle_end_map(void *ctx)
tag.SetTime(data->duration / 1000);
if (data->title != nullptr)
tag.AddItem(TAG_NAME, data->title);
- s->tag = tag.Commit();
+ s->tag = tag.CommitNew();
data->songs.emplace_front(s);
diff --git a/src/playlist/XspfPlaylistPlugin.cxx b/src/playlist/XspfPlaylistPlugin.cxx
index 2935225e4..08fe49191 100644
--- a/src/playlist/XspfPlaylistPlugin.cxx
+++ b/src/playlist/XspfPlaylistPlugin.cxx
@@ -151,7 +151,7 @@ xspf_end_element(gcc_unused GMarkupParseContext *context,
if (strcmp(element_name, "track") == 0) {
if (parser->song != nullptr) {
assert(parser->song->tag == nullptr);
- parser->song->tag = parser->tag_builder.Commit();
+ parser->song->tag = parser->tag_builder.CommitNew();
parser->songs.emplace_front(parser->song);
}
diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx
index acfd24260..d6b3abe55 100644
--- a/src/tag/Tag.cxx
+++ b/src/tag/Tag.cxx
@@ -94,7 +94,7 @@ Tag::Merge(const Tag &base, const Tag &add)
{
TagBuilder builder(add);
builder.Complement(base);
- return builder.Commit();
+ return builder.CommitNew();
}
Tag *
diff --git a/src/tag/TagBuilder.cxx b/src/tag/TagBuilder.cxx
index 3e6d2aeb8..190307986 100644
--- a/src/tag/TagBuilder.cxx
+++ b/src/tag/TagBuilder.cxx
@@ -134,7 +134,7 @@ TagBuilder::Commit(Tag &tag)
}
Tag *
-TagBuilder::Commit()
+TagBuilder::CommitNew()
{
Tag *tag = new Tag();
Commit(*tag);
diff --git a/src/tag/TagBuilder.hxx b/src/tag/TagBuilder.hxx
index fe647db08..302873ee4 100644
--- a/src/tag/TagBuilder.hxx
+++ b/src/tag/TagBuilder.hxx
@@ -101,7 +101,7 @@ public:
* returned object is owned by the caller. This object is
* empty afterwards.
*/
- Tag *Commit();
+ Tag *CommitNew();
void SetTime(int _time) {
time = _time;
diff --git a/src/tag/TagId3.cxx b/src/tag/TagId3.cxx
index 5e9432ce3..0397c0039 100644
--- a/src/tag/TagId3.cxx
+++ b/src/tag/TagId3.cxx
@@ -370,7 +370,7 @@ tag_id3_import(struct id3_tag *tag)
scan_id3_tag(tag, &add_tag_handler, &tag_builder);
return tag_builder.IsEmpty()
? nullptr
- : tag_builder.Commit();
+ : tag_builder.CommitNew();
}
static size_t
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 08:41:19 +0000