mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Ruby: fixed some compiler warnings

Browse source 
Originally committed to SVN as r942.
This commit is contained in:
pomyk 2007-02-25 18:31:09 +00:00
parent 12c1e6f498
commit 4dd9a52482
3 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
aegisub/auto4_ruby.cpp
View file

@ -121,7 +121,6 @@ namespace Automation4 {
ruby_script_sem->Wait(); ruby_script_sem->Wait();
} }
int status = 0;
wxCharBuffer buf = GetFilename().mb_str(wxConvISO8859_1); wxCharBuffer buf = GetFilename().mb_str(wxConvISO8859_1);
const char *t = buf.data(); const char *t = buf.data();
ruby_thread->LoadFile(t); ruby_thread->LoadFile(t);
@ -144,7 +143,7 @@ namespace Automation4 {
version = wxString(StringValueCStr(global_var), wxConvUTF8); version = wxString(StringValueCStr(global_var), wxConvUTF8);
loaded = true; loaded = true;
} }
catch (const wchar_t* e) { catch (...) {
Destroy(); Destroy();
loaded = false; loaded = false;
throw; throw;
@ -176,7 +175,7 @@ namespace Automation4 {
} }
VALUE RubyScript::RubyTextExtents(VALUE self, VALUE _style, VALUE _text) VALUE RubyScript::RubyTextExtents(VALUE /*self*/, VALUE _style, VALUE _text)
{ {
if(TYPE(_style) != T_HASH) if(TYPE(_style) != T_HASH)
rb_raise(rb_eRuntimeError, "text_extents: Style parameter must be a hash"); rb_raise(rb_eRuntimeError, "text_extents: Style parameter must be a hash");
@ -201,7 +200,7 @@ namespace Automation4 {
return result; return result;
} }
VALUE RubyScript::RubyFrameToTime(VALUE self, VALUE frame) VALUE RubyScript::RubyFrameToTime(VALUE /*self*/, VALUE frame)
{ {
if(TYPE(frame) == T_FIXNUM && VFR_Output.IsLoaded()) if(TYPE(frame) == T_FIXNUM && VFR_Output.IsLoaded())
{ {
@ -210,7 +209,7 @@ namespace Automation4 {
return Qnil; return Qnil;
} }
VALUE RubyScript::RubyTimeToFrame(VALUE self, VALUE time) VALUE RubyScript::RubyTimeToFrame(VALUE /*self*/, VALUE time)
{ {
if(TYPE(time) == T_FIXNUM && VFR_Output.IsLoaded()) if(TYPE(time) == T_FIXNUM && VFR_Output.IsLoaded())
{ {
@ -221,7 +220,7 @@ namespace Automation4 {
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// output: [[keyframe indices], [keyframe times in ms]] // output: [[keyframe indices], [keyframe times in ms]]
VALUE RubyScript::RubyKeyFrames(VALUE self) VALUE RubyScript::RubyKeyFrames(VALUE /*self*/)
{ {
if(!VideoContext::Get()->KeyFramesLoaded()) if(!VideoContext::Get()->KeyFramesLoaded())
return Qnil; return Qnil;
@ -231,7 +230,7 @@ namespace Automation4 {
VALUE frames = rb_ary_new(); VALUE frames = rb_ary_new();
VALUE times = rb_ary_new(); VALUE times = rb_ary_new();
for(int i = 0; i < key_frames.size(); ++i) for(unsigned int i = 0; i < key_frames.size(); ++i)
{ {
rb_ary_push(frames, INT2FIX(key_frames[i])); rb_ary_push(frames, INT2FIX(key_frames[i]));
rb_ary_push(times, INT2FIX(VFR_Output.GetTimeAtFrame(key_frames[i], true))); rb_ary_push(times, INT2FIX(VFR_Output.GetTimeAtFrame(key_frames[i], true)));
@ -274,7 +273,7 @@ namespace Automation4 {
{ {
VALUE res = rb_ary_new2(ints.size()); VALUE res = rb_ary_new2(ints.size());
// create an array-style table with an integer vector in it // create an array-style table with an integer vector in it
for (int i = 0; i != ints.size(); ++i) { for (unsigned int i = 0; i < ints.size(); ++i) {
int k = ints[i]; int k = ints[i];
rb_ary_push(res, rb_int2inum(k)); rb_ary_push(res, rb_int2inum(k));
} }
@ -290,11 +289,12 @@ namespace Automation4 {
// RubyFeatureMacro // RubyFeatureMacro
VALUE RubyFeatureMacro::RubyRegister(VALUE self, VALUE name, VALUE description, VALUE macro_function, VALUE validate_function) VALUE RubyFeatureMacro::RubyRegister(VALUE /*self*/, VALUE name, VALUE description, VALUE macro_function, VALUE validate_function)
{ {
wxString _name(StringValueCStr(name), wxConvUTF8); wxString _name(StringValueCStr(name), wxConvUTF8);
wxString _description(StringValueCStr(description), wxConvUTF8); wxString _description(StringValueCStr(description), wxConvUTF8);
RubyFeatureMacro *macro = new RubyFeatureMacro(_name, _description, macro_function, validate_function); RubyFeatureMacro *macro = new RubyFeatureMacro(_name, _description, macro_function, validate_function);
(void)macro;
return Qtrue; return Qtrue;
} }
@ -420,7 +420,7 @@ namespace Automation4 {
rb_define_module_function(RubyAegisub, "display_dialog",reinterpret_cast<RB_HOOK>(&RubyProgressSink::RubyDisplayDialog), 2); rb_define_module_function(RubyAegisub, "display_dialog",reinterpret_cast<RB_HOOK>(&RubyProgressSink::RubyDisplayDialog), 2);
} }
VALUE paths = rb_gv_get("$:"); VALUE paths = rb_gv_get("$:");
for(int i = 0; i < include_path.GetCount(); i++) for(unsigned int i = 0; i < include_path.GetCount(); i++)
{ {
rb_ary_push(paths, rb_str_new2(include_path[i].mb_str(wxConvISO8859_1))); rb_ary_push(paths, rb_str_new2(include_path[i].mb_str(wxConvISO8859_1)));
} }
@ -486,12 +486,13 @@ namespace Automation4 {
// Don't think there's anything to do here... (empty in auto3) // Don't think there's anything to do here... (empty in auto3)
} }
VALUE RubyFeatureFilter::RubyRegister(VALUE self, VALUE name, VALUE description, VALUE merit, VALUE function, VALUE dialog) VALUE RubyFeatureFilter::RubyRegister(VALUE /*self*/, VALUE name, VALUE description, VALUE merit, VALUE function, VALUE dialog)
{ {
wxString _name(StringValueCStr(name), wxConvUTF8); wxString _name(StringValueCStr(name), wxConvUTF8);
wxString _description(StringValueCStr(description), wxConvUTF8); wxString _description(StringValueCStr(description), wxConvUTF8);
int _merit = rb_num2long(merit); int _merit = rb_num2long(merit);
RubyFeatureFilter *filter = new RubyFeatureFilter(_name, _description, _merit, function, dialog); RubyFeatureFilter *filter = new RubyFeatureFilter(_name, _description, _merit, function, dialog);
(void)filter;
return Qtrue; return Qtrue;
} }
@ -567,7 +568,7 @@ namespace Automation4 {
// RubyProgressSink // RubyProgressSink
RubyProgressSink::RubyProgressSink(wxWindow *parent, bool allow_config_dialog) RubyProgressSink::RubyProgressSink(wxWindow *parent, bool /*allow_config_dialog*/)
: ProgressSink(parent) : ProgressSink(parent)
{ {
} }
@ -576,35 +577,35 @@ namespace Automation4 {
{ {
} }
VALUE RubyProgressSink::RubySetProgress(VALUE self, VALUE progress) VALUE RubyProgressSink::RubySetProgress(VALUE /*self*/, VALUE progress)
{ {
float _progr = rb_num2dbl(progress); float _progr = rb_num2dbl(progress);
RubyProgressSink::inst->SetProgress(_progr); RubyProgressSink::inst->SetProgress(_progr);
return Qtrue; return Qtrue;
} }
VALUE RubyProgressSink::RubySetTask(VALUE self, VALUE task) VALUE RubyProgressSink::RubySetTask(VALUE /*self*/, VALUE task)
{ {
wxString _t(StringValueCStr(task), wxConvUTF8); wxString _t(StringValueCStr(task), wxConvUTF8);
RubyProgressSink::inst->SetTask(_t); RubyProgressSink::inst->SetTask(_t);
return Qtrue; return Qtrue;
} }
VALUE RubyProgressSink::RubySetTitle(VALUE self, VALUE title) VALUE RubyProgressSink::RubySetTitle(VALUE /*self*/, VALUE title)
{ {
wxString _t(StringValueCStr(title), wxConvUTF8); wxString _t(StringValueCStr(title), wxConvUTF8);
RubyProgressSink::inst->SetTitle(_t); RubyProgressSink::inst->SetTitle(_t);
return Qtrue; return Qtrue;
} }
VALUE RubyProgressSink::RubyGetCancelled(VALUE self) VALUE RubyProgressSink::RubyGetCancelled(VALUE /*self*/)
{ {
if(RubyProgressSink::inst->cancelled) if(RubyProgressSink::inst->cancelled)
return Qtrue; return Qtrue;
return Qfalse; return Qfalse;
} }
VALUE RubyProgressSink::RubyDebugOut(int argc, VALUE *args, VALUE self) VALUE RubyProgressSink::RubyDebugOut(int argc, VALUE *args, VALUE /*self*/)
{ {
if(argc > 1 && TYPE(args[0]) == T_FIXNUM) if(argc > 1 && TYPE(args[0]) == T_FIXNUM)
{ {
@ -617,7 +618,7 @@ namespace Automation4 {
return Qtrue; return Qtrue;
} }
VALUE RubyProgressSink::RubyDisplayDialog(VALUE self, VALUE dialog_data, VALUE buttons) VALUE RubyProgressSink::RubyDisplayDialog(VALUE /*self*/, VALUE dialog_data, VALUE buttons)
{ {
// Send the "show dialog" event // Send the "show dialog" event
ShowConfigDialogEvent evt; ShowConfigDialogEvent evt;
@ -701,9 +702,9 @@ namespace Automation4 {
RubyCallArguments &a = *reinterpret_cast<RubyCallArguments*>(arg); RubyCallArguments &a = *reinterpret_cast<RubyCallArguments*>(arg);
return rb_funcall2(a.recv, a.id, a.n, a.argv); return rb_funcall2(a.recv, a.id, a.n, a.argv);
} }
VALUE rbExecWrapper(VALUE arg){return ruby_exec();} VALUE rbExecWrapper(VALUE /*arg*/){return ruby_exec();}
VALUE rbLoadWrapper(VALUE arg){rb_load(arg, 0); return Qtrue;} VALUE rbLoadWrapper(VALUE arg){rb_load(arg, 0); return Qtrue;}
VALUE rbGcWrapper(VALUE arg){rb_gc_start(); return Qtrue;} VALUE rbGcWrapper(VALUE /*arg*/){rb_gc_start(); return Qtrue;}
VALUE rbAss2RbWrapper(VALUE arg){return RubyAssFile::AssEntryToRuby(reinterpret_cast<AssEntry*>(arg));} VALUE rbAss2RbWrapper(VALUE arg){return RubyAssFile::AssEntryToRuby(reinterpret_cast<AssEntry*>(arg));}
VALUE rb2AssWrapper(VALUE arg){return reinterpret_cast<VALUE>(RubyAssFile::RubyToAssEntry(arg));} VALUE rb2AssWrapper(VALUE arg){return reinterpret_cast<VALUE>(RubyAssFile::RubyToAssEntry(arg));}

2
aegisub/auto4_ruby.h
View file

@ -38,6 +38,8 @@
#ifndef _AUTO4_RUBY_H #ifndef _AUTO4_RUBY_H
#define _AUTO4_RUBY_H #define _AUTO4_RUBY_H
#pragma warning(disable: 4311 4312)
#include "auto4_base.h" #include "auto4_base.h"
#include <wx/thread.h> #include <wx/thread.h>
#include <wx/event.h> #include <wx/event.h>

10
aegisub/auto4_ruby_assfile.cpp
View file

@ -216,13 +216,13 @@ namespace Automation4 {
VALUE _color4 = rb_hash_aref(ass_entry, STR2SYM("color4")); VALUE _color4 = rb_hash_aref(ass_entry, STR2SYM("color4"));
wxString color4(StringValueCStr(_color4), wxConvUTF8); wxString color4(StringValueCStr(_color4), wxConvUTF8);
VALUE _bold = rb_hash_aref(ass_entry, STR2SYM("bold")); VALUE _bold = rb_hash_aref(ass_entry, STR2SYM("bold"));
bool bold = (bool)rb_num2long(_bold); bool bold = rb_num2long(_bold) == 1;
VALUE _italic = rb_hash_aref(ass_entry, STR2SYM("italic")); VALUE _italic = rb_hash_aref(ass_entry, STR2SYM("italic"));
bool italic = (bool)rb_num2long(_italic); bool italic = rb_num2long(_italic) == 1;
VALUE _underline = rb_hash_aref(ass_entry, STR2SYM("underline")); VALUE _underline = rb_hash_aref(ass_entry, STR2SYM("underline"));
bool underline = (bool)rb_num2long(_underline); bool underline = rb_num2long(_underline) == 1;
VALUE _strikeout = rb_hash_aref(ass_entry, STR2SYM("strikeout")); VALUE _strikeout = rb_hash_aref(ass_entry, STR2SYM("strikeout"));
bool strikeout = (bool)rb_num2long(_strikeout); bool strikeout = rb_num2long(_strikeout) == 1;
VALUE _scale_x = rb_hash_aref(ass_entry, STR2SYM("scale_x")); VALUE _scale_x = rb_hash_aref(ass_entry, STR2SYM("scale_x"));
float scale_x = rb_num2dbl(_scale_x); float scale_x = rb_num2dbl(_scale_x);
VALUE _scale_y = rb_hash_aref(ass_entry, STR2SYM("scale_y")); VALUE _scale_y = rb_hash_aref(ass_entry, STR2SYM("scale_y"));
@ -281,7 +281,6 @@ namespace Automation4 {
result = sty; result = sty;
} else if (lclass == _T("styleex")) { } else if (lclass == _T("styleex")) {
rb_raise(rb_eRuntimeError, "Found line with class 'styleex' which is not supported. Wait until AS5 is a reality."); rb_raise(rb_eRuntimeError, "Found line with class 'styleex' which is not supported. Wait until AS5 is a reality.");
return 0;
} else if (lclass == _T("dialogue")) { } else if (lclass == _T("dialogue")) {
VALUE _comment = rb_hash_aref(ass_entry, STR2SYM("comment")); VALUE _comment = rb_hash_aref(ass_entry, STR2SYM("comment"));
@ -329,7 +328,6 @@ namespace Automation4 {
} else { } else {
rb_raise(rb_eRuntimeError, "Found line with unknown class: %s", lclass.mb_str(wxConvUTF8).data()); rb_raise(rb_eRuntimeError, "Found line with unknown class: %s", lclass.mb_str(wxConvUTF8).data());
return 0;
} }
return result; return result;