[Scummvm-cvs-logs] SF.net SVN: scummvm:[42703] tools/branches/gsoc2009-gui

[Remere at users.sourceforge.net]

Revision: 42703
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42703&view=rev
Author:   Remere
Date:     2009-07-24 20:45:42 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
*Fixed faulty comments
*GUI now only displays supported audio formats as options (for tools that don't support all).

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/compress_scumm_sou.cpp
    tools/branches/gsoc2009-gui/gui/pages.cpp
    tools/branches/gsoc2009-gui/tool.cpp
    tools/branches/gsoc2009-gui/tool.h
    tools/branches/gsoc2009-gui/util.h

Modified: tools/branches/gsoc2009-gui/compress_scumm_sou.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_scumm_sou.cpp	2009-07-24 20:41:37 UTC (rev 42702)
+++ tools/branches/gsoc2009-gui/compress_scumm_sou.cpp	2009-07-24 20:45:42 UTC (rev 42703)
@@ -1,4 +1,3 @@
-
 /* compress_scumm_sou - monster.sou to MP3-compressed monster.so3 converter
  * Copyright (C) 2002-2006  The ScummVM Team
  *

Modified: tools/branches/gsoc2009-gui/gui/pages.cpp
===================================================================
--- tools/branches/gsoc2009-gui/gui/pages.cpp	2009-07-24 20:41:37 UTC (rev 42702)
+++ tools/branches/gsoc2009-gui/gui/pages.cpp	2009-07-24 20:45:42 UTC (rev 42703)
@@ -565,10 +565,15 @@
 	
 	wxArrayString choices;
 
-	choices.Add(wxT("Vorbis"));
-	choices.Add(wxT("FLAC"));
-	choices.Add(wxT("MP3"));
+	const ToolGUI *tool = _configuration.selectedTool;
 
+	if (tool->supportsAudioFormat(AUDIO_VORBIS))
+		choices.Add(wxT("Vorbis"));
+	if (tool->supportsAudioFormat(AUDIO_FLAC))
+		choices.Add(wxT("FLAC"));
+	if (tool->supportsAudioFormat(AUDIO_MP3))
+		choices.Add(wxT("MP3"));
+
 	wxChoice *format = new wxChoice(panel, wxID_ANY, wxDefaultPosition, wxSize(80, -1), 
 		choices, 0, wxDefaultValidator, wxT("AudioSelection"));
 	sizer->Add(format);

Modified: tools/branches/gsoc2009-gui/tool.cpp
===================================================================
--- tools/branches/gsoc2009-gui/tool.cpp	2009-07-24 20:41:37 UTC (rev 42702)
+++ tools/branches/gsoc2009-gui/tool.cpp	2009-07-24 20:45:42 UTC (rev 42703)
@@ -34,7 +34,7 @@
 	_argv = NULL;
 
 	_outputToDirectory = true;
-	_supportedFormats = AUDIO_NONE;
+	_supportedFormats = AUDIO_ALL;
 	_supportsProgressBar = false;
 
 	_internalPrint = standardPrint;

Modified: tools/branches/gsoc2009-gui/tool.h
===================================================================
--- tools/branches/gsoc2009-gui/tool.h	2009-07-24 20:41:37 UTC (rev 42702)
+++ tools/branches/gsoc2009-gui/tool.h	2009-07-24 20:45:42 UTC (rev 42703)
@@ -216,7 +216,6 @@
 	ProgressFunction _internalProgress;
 	void *_progress_udata;
 
-
 	typedef int (*SubprocessFunction)(void *, const char *);
 	SubprocessFunction _internalSubprocess;
 	void *_subprocess_udata;

Modified: tools/branches/gsoc2009-gui/util.h
===================================================================
--- tools/branches/gsoc2009-gui/util.h	2009-07-24 20:41:37 UTC (rev 42702)
+++ tools/branches/gsoc2009-gui/util.h	2009-07-24 20:45:42 UTC (rev 42703)
@@ -426,7 +426,7 @@
 	size_t readN(void *data, size_t elementSize, size_t elementCount);
 
 	/**
-	 * Read a single 32-bit word, little endian.
+	 * Reads a full string, until NULL or EOF
 	 * Throws FileException if file is not open / if read failed.
 	 */
 	std::string readString();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.