Skip to content

Commit

Permalink
Added libav and removed null extension
Browse files Browse the repository at this point in the history
  • Loading branch information
ankit-kumar-dwivedi committed Feb 18, 2019
1 parent e52ae5c commit 6e8eb2f
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions synfig-studio/src/gui/render.cpp
Expand Up @@ -240,16 +240,16 @@ RenderSettings::set_entry_filename()
void
RenderSettings::on_comboboxtext_target_changed()
{
std::map<std::string,std::string> ext = {{"Auto","null"}, {"bmp",".bmp"}, {"cairo_png",".png"},{"dv",".dv"},
std::map<std::string,std::string> ext = {{"bmp",".bmp"}, {"cairo_png",".png"},{"dv",".dv"},
{"ffmpeg",".avi"},{"gif",".gif"},{"imagemagick",".png"}, {"jpeg",".jpg"},
{"magick++",".gif"},{"mng",".mng"}, {"null","null"},{"null-tile","null"},{"openexr",".exr"},
{"png",".png"}, {"png-spritesheet",".png"},{"ppm",".ppm"}, {"yuv420p",".yuv"}};
{"magick++",".gif"},{"mng",".mng"},{"openexr",".exr"},{"png",".png"},
{"png-spritesheet",".png"},{"ppm",".ppm"}, {"yuv420p",".yuv"}, {"libav",".avi"}};
int i = comboboxtext_target.get_active_row_number();
if (i < 0 || i >= (int)target_names.size()) return;
if (target_name == target_names[i]) return;
auto itr = ext.find(target_names[i]);
// check if target_name is there in map and if present it's .ext is not "null"
if(itr != ext.end() && (itr->second)!="null")
// check if target_name is there in map
if(itr != ext.end())
{
String filename = entry_filename.get_text();
String newfilename = filename.substr(0,filename.find_last_of('.'))+itr->second;
Expand Down Expand Up @@ -285,9 +285,9 @@ RenderSettings::on_targetparam_pressed()
{
Dialog_TargetParam * dialogtp;
//TODO: Replace this conditions too
if (target_name.compare("ffmpeg") == 0)
if (!target_name.compare("ffmpeg"))
dialogtp = new Dialog_FFmpegParam (*this);
else if (target_name.compare("png-spritesheet") == 0)
else if (!target_name.compare("png-spritesheet"))
dialogtp = new Dialog_SpriteSheetParam (*this);
else
return;
Expand Down

0 comments on commit 6e8eb2f

Please sign in to comment.