mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Eliminate some unused variables

Browse source 
Originally committed to SVN as r5893.
This commit is contained in:
Thomas Goyne 2011-11-19 04:46:45 +00:00
parent 236ea4261d
commit 9a53dc0440
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aegisub/src/audio_player_openal.cpp
View file

@ -187,7 +187,6 @@ void OpenALPlayer::Stop(bool timerToo)
void OpenALPlayer::FillBuffers(ALsizei count) void OpenALPlayer::FillBuffers(ALsizei count)
{ {
// Do the actual filling/queueing // Do the actual filling/queueing
ALuint bufid = buf_first_free;
for (count = mid(1, count, buffers_free); count > 0; --count) { for (count = mid(1, count, buffers_free); count > 0; --count) {
ALsizei fill_len = mid<ALsizei>(0, decode_buffer.size() / bpf, end_frame - cur_frame); ALsizei fill_len = mid<ALsizei>(0, decode_buffer.size() / bpf, end_frame - cur_frame);

6
aegisub/src/charset_detect.cpp
View file

@ -54,20 +54,16 @@
namespace CharSetDetect { namespace CharSetDetect {
wxString GetEncoding(wxString const& filename) { wxString GetEncoding(wxString const& filename) {
bool unknown = 0;
agi::charset::CharsetListDetected list; agi::charset::CharsetListDetected list;
agi::charset::CharsetListDetected::const_iterator i_lst; agi::charset::CharsetListDetected::const_iterator i_lst;
try { try {
agi::charset::DetectAll(STD_STR(filename), list); agi::charset::DetectAll(STD_STR(filename), list);
} catch (const agi::charset::UnknownCharset&) { } catch (const agi::charset::UnknownCharset&) {
unknown = 1; /// @todo If the charset is unknown we need to display a complete list of character sets.
} }
/// @todo If the charset is unknown we need to display a complete list of character sets.
if (list.size() > 1) { if (list.size() > 1) {
// Get choice from user // Get choice from user
wxArrayString choices; wxArrayString choices;

4
aegisub/src/subs_grid.cpp
View file

@ -167,7 +167,7 @@ void SubtitlesGrid::InsertLine(AssDialogue *line,int n,bool after,bool update) {
entryIter pos = std::find(context->ass->Line.begin(), context->ass->Line.end(), rel_line); entryIter pos = std::find(context->ass->Line.begin(), context->ass->Line.end(), rel_line);
if (after) ++pos; if (after) ++pos;
entryIter newIter = context->ass->Line.insert(pos,line); context->ass->Line.insert(pos,line);
// Update // Update
if (update) { if (update) {
@ -305,7 +305,6 @@ void SubtitlesGrid::PasteLines(int n,bool pasteOver) {
void SubtitlesGrid::DeleteLines(wxArrayInt target, bool flagModified) { void SubtitlesGrid::DeleteLines(wxArrayInt target, bool flagModified) {
entryIter before_first = std::find_if(context->ass->Line.begin(), context->ass->Line.end(), cast<AssDialogue*>()); --before_first; entryIter before_first = std::find_if(context->ass->Line.begin(), context->ass->Line.end(), cast<AssDialogue*>()); --before_first;
int old_active_line_index = GetDialogueIndex(GetActiveLine());
int row = -1; int row = -1;
int deleted = 0; int deleted = 0;
@ -325,7 +324,6 @@ void SubtitlesGrid::DeleteLines(wxArrayInt target, bool flagModified) {
AssDialogue *def = new AssDialogue; AssDialogue *def = new AssDialogue;
++before_first; ++before_first;
context->ass->Line.insert(before_first, def); context->ass->Line.insert(before_first, def);
old_active_line_index = 0;
} }
if (flagModified) { if (flagModified) {