mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-16 16:10:06 +02:00
Changes from Richard to remove the remains of UploadDialog, which was deemed to be a hazard. + a change for Win.
This commit is contained in:
martynshaw99
parent
e4f9578d3b
commit
8de5487284
@ -19,69 +19,12 @@
|
||||
FileIO::FileIO(const wxString name, FileIOMode mode)
|
||||
: mName(name),
|
||||
mMode(mode),
|
||||
mFtp(NULL),
|
||||
mInputStream(NULL),
|
||||
mOutputStream(NULL),
|
||||
mOpen(false)
|
||||
{
|
||||
wxString scheme;
|
||||
|
||||
mUri.Create(mName);
|
||||
scheme = mUri.GetScheme();
|
||||
|
||||
if (scheme == wxT("ftp")) {
|
||||
wxString user = mUri.GetUser();
|
||||
wxString pass = mUri.GetPassword();;
|
||||
|
||||
mFtp = new wxFTP();
|
||||
mFtp->SetDefaultTimeout(60);
|
||||
|
||||
if (!user.IsEmpty()) {
|
||||
mFtp->SetUser(user);
|
||||
}
|
||||
|
||||
if (!pass.IsEmpty()) {
|
||||
mFtp->SetPassword(pass);
|
||||
}
|
||||
|
||||
if (!mFtp->Connect(mUri.GetServer())) {
|
||||
wxPrintf(wxT("Couldn't connect to server\n"));
|
||||
|
||||
delete mFtp;
|
||||
mFtp = NULL;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
mFtp->SetBinary();
|
||||
mFtp->SetPassive(true);
|
||||
|
||||
if (mMode == FileIO::Input) {
|
||||
mInputStream = mFtp->GetInputStream(mUri.GetPath());
|
||||
if (mInputStream == NULL) {
|
||||
wxPrintf(wxT("Couldn't get input stream: %s\n"), mUri.GetPath().c_str());
|
||||
|
||||
delete mFtp;
|
||||
mFtp = NULL;
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
else {
|
||||
mOutputStream = mFtp->GetOutputStream(mUri.GetPath());
|
||||
if (mOutputStream == NULL) {
|
||||
wxPrintf(wxT("Couldn't get output stream: %s\n"), mUri.GetPath().c_str());
|
||||
|
||||
delete mFtp;
|
||||
mFtp = NULL;
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
mOpen = true;
|
||||
}
|
||||
else {
|
||||
if (mMode == FileIO::Input) {
|
||||
mInputStream = new wxFFileInputStream(mName);
|
||||
if (mInputStream == NULL) {
|
||||
@ -98,7 +41,6 @@ FileIO::FileIO(const wxString name, FileIOMode mode)
|
||||
}
|
||||
|
||||
mOpen = true;
|
||||
}
|
||||
}
|
||||
|
||||
FileIO::~FileIO()
|
||||
@ -123,11 +65,6 @@ void FileIO::Close()
|
||||
mInputStream = NULL;
|
||||
}
|
||||
|
||||
if (mFtp) {
|
||||
delete mFtp;
|
||||
mFtp = NULL;
|
||||
}
|
||||
|
||||
SetCatalogInfo();
|
||||
|
||||
mOpen = false;
|
||||
@ -139,7 +76,7 @@ void FileIO::Close()
|
||||
void FileIO::SetCatalogInfo()
|
||||
{
|
||||
#ifdef __WXMAC__
|
||||
if (!mOpen || mFtp != NULL) {
|
||||
if (!mOpen ) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -161,7 +98,7 @@ void FileIO::SetCatalogInfo()
|
||||
void FileIO::SetCatalogInfo(wxUint32 type)
|
||||
{
|
||||
#ifdef __WXMAC__
|
||||
if (!mOpen || mFtp != NULL) {
|
||||
if (!mOpen ) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
|
||||
#include <wx/object.h>
|
||||
#include <wx/wfstream.h>
|
||||
#include <wx/protocol/ftp.h>
|
||||
|
||||
class FileIO
|
||||
{
|
||||
@ -43,8 +42,6 @@ class FileIO
|
||||
private:
|
||||
wxString mName;
|
||||
FileIOMode mMode;
|
||||
wxURI mUri;
|
||||
wxFTP *mFtp;
|
||||
wxInputStream *mInputStream;
|
||||
wxOutputStream *mOutputStream;
|
||||
bool mOpen;
|
||||
|
||||
@ -197,14 +197,12 @@ audacity_SOURCES = \
|
||||
TrackPanel.cpp \
|
||||
TrackPanel.h \
|
||||
TrackPanelAx.cpp \
|
||||
TrackPanelAx.h \
|
||||
UndoManager.cpp \
|
||||
UndoManager.h \
|
||||
UploadDialog.cpp \
|
||||
UploadDialog.h \
|
||||
ViewInfo.h \
|
||||
VoiceKey.cpp \
|
||||
VoiceKey.h \
|
||||
TrackPanelAx.h \
|
||||
UndoManager.cpp \
|
||||
UndoManager.h \
|
||||
ViewInfo.h \
|
||||
VoiceKey.cpp \
|
||||
VoiceKey.h \
|
||||
WaveClip.cpp \
|
||||
WaveClip.h \
|
||||
WaveTrack.cpp \
|
||||
|
||||
166
src/Makefile.in
166
src/Makefile.in
@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.13.3 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
# Makefile.in generated by automake 1.13.4 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -211,22 +211,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
|
||||
$(top_srcdir)/m4/ax_cflags_strict_prototypes.m4 \
|
||||
$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
|
||||
$(top_srcdir)/m4/ax_check_compiler_flags.m4 \
|
||||
$(top_srcdir)/m4/ax_compiler_vendor.m4 \
|
||||
$(top_srcdir)/m4/ax_cxx_check_flag.m4 \
|
||||
$(top_srcdir)/m4/ax_cxxcpp_check_flag.m4 \
|
||||
$(top_srcdir)/m4/ax_ld_check_flag.m4 \
|
||||
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
|
||||
$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
|
||||
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
|
||||
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
|
||||
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
|
||||
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
|
||||
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
|
||||
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/visibility.m4 \
|
||||
$(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
$(top_srcdir)/m4/ax_compiler_vendor.m4 \
|
||||
$(top_srcdir)/m4/ax_cxx_check_flag.m4 \
|
||||
$(top_srcdir)/m4/ax_cxxcpp_check_flag.m4 \
|
||||
$(top_srcdir)/m4/ax_ld_check_flag.m4 $(top_srcdir)/m4/pkg.m4 \
|
||||
$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = configwin.h configunix.h
|
||||
CONFIG_CLEAN_FILES = audacity.desktop
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
@ -297,26 +289,25 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \
|
||||
SoundActivatedRecord.h Spectrum.cpp Spectrum.h \
|
||||
SplashDialog.cpp SplashDialog.h Tags.cpp Tags.h Theme.cpp \
|
||||
Theme.h ThemeAsCeeCode.h TimeDialog.cpp TimeDialog.h \
|
||||
TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \
|
||||
TimeTrack.h Track.cpp Track.h TrackArtist.cpp TrackArtist.h \
|
||||
TrackPanel.cpp TrackPanel.h TrackPanelAx.cpp TrackPanelAx.h \
|
||||
UndoManager.cpp UndoManager.h UploadDialog.cpp UploadDialog.h \
|
||||
ViewInfo.h VoiceKey.cpp VoiceKey.h WaveClip.cpp WaveClip.h \
|
||||
WaveTrack.cpp WaveTrack.h WrappedType.cpp WrappedType.h \
|
||||
commands/AppCommandEvent.cpp commands/AppCommandEvent.h \
|
||||
commands/BatchEvalCommand.cpp commands/BatchEvalCommand.h \
|
||||
commands/Command.cpp commands/Command.h \
|
||||
commands/CommandBuilder.cpp commands/CommandBuilder.h \
|
||||
commands/CommandDirectory.cpp commands/CommandDirectory.h \
|
||||
commands/CommandHandler.cpp commands/CommandHandler.h \
|
||||
commands/CommandManager.cpp commands/CommandManager.h \
|
||||
commands/CommandMisc.h commands/CommandSignature.cpp \
|
||||
commands/CommandSignature.h commands/CommandTargets.h \
|
||||
commands/CommandType.cpp commands/CommandType.h \
|
||||
commands/CompareAudioCommand.cpp \
|
||||
commands/CompareAudioCommand.h commands/ExecMenuCommand.cpp \
|
||||
commands/ExecMenuCommand.h commands/GetAllMenuCommands.cpp \
|
||||
commands/GetAllMenuCommands.h \
|
||||
TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \
|
||||
TimeTrack.h Track.cpp Track.h TrackArtist.cpp TrackArtist.h \
|
||||
TrackPanel.cpp TrackPanel.h TrackPanelAx.cpp TrackPanelAx.h \
|
||||
UndoManager.cpp UndoManager.h ViewInfo.h VoiceKey.cpp \
|
||||
VoiceKey.h WaveClip.cpp WaveClip.h WaveTrack.cpp WaveTrack.h \
|
||||
WrappedType.cpp WrappedType.h commands/AppCommandEvent.cpp \
|
||||
commands/AppCommandEvent.h commands/BatchEvalCommand.cpp \
|
||||
commands/BatchEvalCommand.h commands/Command.cpp \
|
||||
commands/Command.h commands/CommandBuilder.cpp \
|
||||
commands/CommandBuilder.h commands/CommandDirectory.cpp \
|
||||
commands/CommandDirectory.h commands/CommandHandler.cpp \
|
||||
commands/CommandHandler.h commands/CommandManager.cpp \
|
||||
commands/CommandManager.h commands/CommandMisc.h \
|
||||
commands/CommandSignature.cpp commands/CommandSignature.h \
|
||||
commands/CommandTargets.h commands/CommandType.cpp \
|
||||
commands/CommandType.h commands/CompareAudioCommand.cpp \
|
||||
commands/CompareAudioCommand.h commands/ExecMenuCommand.cpp \
|
||||
commands/ExecMenuCommand.h commands/GetAllMenuCommands.cpp \
|
||||
commands/GetAllMenuCommands.h \
|
||||
commands/GetProjectInfoCommand.cpp \
|
||||
commands/GetProjectInfoCommand.h \
|
||||
commands/GetTrackInfoCommand.cpp \
|
||||
@ -528,15 +519,14 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \
|
||||
audacity-Tags.$(OBJEXT) audacity-Theme.$(OBJEXT) \
|
||||
audacity-TimeDialog.$(OBJEXT) \
|
||||
audacity-TimerRecordDialog.$(OBJEXT) \
|
||||
audacity-TimeTrack.$(OBJEXT) audacity-Track.$(OBJEXT) \
|
||||
audacity-TrackArtist.$(OBJEXT) audacity-TrackPanel.$(OBJEXT) \
|
||||
audacity-TrackPanelAx.$(OBJEXT) audacity-UndoManager.$(OBJEXT) \
|
||||
audacity-UploadDialog.$(OBJEXT) audacity-VoiceKey.$(OBJEXT) \
|
||||
audacity-WaveClip.$(OBJEXT) audacity-WaveTrack.$(OBJEXT) \
|
||||
audacity-WrappedType.$(OBJEXT) \
|
||||
commands/audacity-AppCommandEvent.$(OBJEXT) \
|
||||
commands/audacity-BatchEvalCommand.$(OBJEXT) \
|
||||
commands/audacity-Command.$(OBJEXT) \
|
||||
audacity-TimeTrack.$(OBJEXT) audacity-Track.$(OBJEXT) \
|
||||
audacity-TrackArtist.$(OBJEXT) audacity-TrackPanel.$(OBJEXT) \
|
||||
audacity-TrackPanelAx.$(OBJEXT) audacity-UndoManager.$(OBJEXT) \
|
||||
audacity-VoiceKey.$(OBJEXT) audacity-WaveClip.$(OBJEXT) \
|
||||
audacity-WaveTrack.$(OBJEXT) audacity-WrappedType.$(OBJEXT) \
|
||||
commands/audacity-AppCommandEvent.$(OBJEXT) \
|
||||
commands/audacity-BatchEvalCommand.$(OBJEXT) \
|
||||
commands/audacity-Command.$(OBJEXT) \
|
||||
commands/audacity-CommandBuilder.$(OBJEXT) \
|
||||
commands/audacity-CommandDirectory.$(OBJEXT) \
|
||||
commands/audacity-CommandHandler.$(OBJEXT) \
|
||||
@ -1113,26 +1103,25 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \
|
||||
SoundActivatedRecord.h Spectrum.cpp Spectrum.h \
|
||||
SplashDialog.cpp SplashDialog.h Tags.cpp Tags.h Theme.cpp \
|
||||
Theme.h ThemeAsCeeCode.h TimeDialog.cpp TimeDialog.h \
|
||||
TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \
|
||||
TimeTrack.h Track.cpp Track.h TrackArtist.cpp TrackArtist.h \
|
||||
TrackPanel.cpp TrackPanel.h TrackPanelAx.cpp TrackPanelAx.h \
|
||||
UndoManager.cpp UndoManager.h UploadDialog.cpp UploadDialog.h \
|
||||
ViewInfo.h VoiceKey.cpp VoiceKey.h WaveClip.cpp WaveClip.h \
|
||||
WaveTrack.cpp WaveTrack.h WrappedType.cpp WrappedType.h \
|
||||
commands/AppCommandEvent.cpp commands/AppCommandEvent.h \
|
||||
commands/BatchEvalCommand.cpp commands/BatchEvalCommand.h \
|
||||
commands/Command.cpp commands/Command.h \
|
||||
commands/CommandBuilder.cpp commands/CommandBuilder.h \
|
||||
commands/CommandDirectory.cpp commands/CommandDirectory.h \
|
||||
commands/CommandHandler.cpp commands/CommandHandler.h \
|
||||
commands/CommandManager.cpp commands/CommandManager.h \
|
||||
commands/CommandMisc.h commands/CommandSignature.cpp \
|
||||
commands/CommandSignature.h commands/CommandTargets.h \
|
||||
commands/CommandType.cpp commands/CommandType.h \
|
||||
commands/CompareAudioCommand.cpp \
|
||||
commands/CompareAudioCommand.h commands/ExecMenuCommand.cpp \
|
||||
commands/ExecMenuCommand.h commands/GetAllMenuCommands.cpp \
|
||||
commands/GetAllMenuCommands.h \
|
||||
TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \
|
||||
TimeTrack.h Track.cpp Track.h TrackArtist.cpp TrackArtist.h \
|
||||
TrackPanel.cpp TrackPanel.h TrackPanelAx.cpp TrackPanelAx.h \
|
||||
UndoManager.cpp UndoManager.h ViewInfo.h VoiceKey.cpp \
|
||||
VoiceKey.h WaveClip.cpp WaveClip.h WaveTrack.cpp WaveTrack.h \
|
||||
WrappedType.cpp WrappedType.h commands/AppCommandEvent.cpp \
|
||||
commands/AppCommandEvent.h commands/BatchEvalCommand.cpp \
|
||||
commands/BatchEvalCommand.h commands/Command.cpp \
|
||||
commands/Command.h commands/CommandBuilder.cpp \
|
||||
commands/CommandBuilder.h commands/CommandDirectory.cpp \
|
||||
commands/CommandDirectory.h commands/CommandHandler.cpp \
|
||||
commands/CommandHandler.h commands/CommandManager.cpp \
|
||||
commands/CommandManager.h commands/CommandMisc.h \
|
||||
commands/CommandSignature.cpp commands/CommandSignature.h \
|
||||
commands/CommandTargets.h commands/CommandType.cpp \
|
||||
commands/CommandType.h commands/CompareAudioCommand.cpp \
|
||||
commands/CompareAudioCommand.h commands/ExecMenuCommand.cpp \
|
||||
commands/ExecMenuCommand.h commands/GetAllMenuCommands.cpp \
|
||||
commands/GetAllMenuCommands.h \
|
||||
commands/GetProjectInfoCommand.cpp \
|
||||
commands/GetProjectInfoCommand.h \
|
||||
commands/GetTrackInfoCommand.cpp \
|
||||
@ -1955,13 +1944,12 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-TimerRecordDialog.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-Track.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-TrackArtist.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-TrackPanel.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-TrackPanelAx.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-UndoManager.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-UploadDialog.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-VoiceKey.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-WaveClip.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-WaveTrack.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-TrackPanel.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-TrackPanelAx.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-UndoManager.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-VoiceKey.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-WaveClip.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-WaveTrack.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audacity-WrappedType.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaudacity_la-BlockFile.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaudacity_la-DirManager.Plo@am__quote@
|
||||
@ -3376,26 +3364,12 @@ audacity-UndoManager.obj: UndoManager.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audacity-UndoManager.obj -MD -MP -MF $(DEPDIR)/audacity-UndoManager.Tpo -c -o audacity-UndoManager.obj `if test -f 'UndoManager.cpp'; then $(CYGPATH_W) 'UndoManager.cpp'; else $(CYGPATH_W) '$(srcdir)/UndoManager.cpp'; fi`
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-UndoManager.Tpo $(DEPDIR)/audacity-UndoManager.Po
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='UndoManager.cpp' object='audacity-UndoManager.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audacity-UndoManager.obj `if test -f 'UndoManager.cpp'; then $(CYGPATH_W) 'UndoManager.cpp'; else $(CYGPATH_W) '$(srcdir)/UndoManager.cpp'; fi`
|
||||
|
||||
audacity-UploadDialog.o: UploadDialog.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audacity-UploadDialog.o -MD -MP -MF $(DEPDIR)/audacity-UploadDialog.Tpo -c -o audacity-UploadDialog.o `test -f 'UploadDialog.cpp' || echo '$(srcdir)/'`UploadDialog.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-UploadDialog.Tpo $(DEPDIR)/audacity-UploadDialog.Po
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='UploadDialog.cpp' object='audacity-UploadDialog.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audacity-UploadDialog.o `test -f 'UploadDialog.cpp' || echo '$(srcdir)/'`UploadDialog.cpp
|
||||
|
||||
audacity-UploadDialog.obj: UploadDialog.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audacity-UploadDialog.obj -MD -MP -MF $(DEPDIR)/audacity-UploadDialog.Tpo -c -o audacity-UploadDialog.obj `if test -f 'UploadDialog.cpp'; then $(CYGPATH_W) 'UploadDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadDialog.cpp'; fi`
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-UploadDialog.Tpo $(DEPDIR)/audacity-UploadDialog.Po
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='UploadDialog.cpp' object='audacity-UploadDialog.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audacity-UploadDialog.obj `if test -f 'UploadDialog.cpp'; then $(CYGPATH_W) 'UploadDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadDialog.cpp'; fi`
|
||||
|
||||
audacity-VoiceKey.o: VoiceKey.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audacity-VoiceKey.o -MD -MP -MF $(DEPDIR)/audacity-VoiceKey.Tpo -c -o audacity-VoiceKey.o `test -f 'VoiceKey.cpp' || echo '$(srcdir)/'`VoiceKey.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-VoiceKey.Tpo $(DEPDIR)/audacity-VoiceKey.Po
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audacity-UndoManager.obj `if test -f 'UndoManager.cpp'; then $(CYGPATH_W) 'UndoManager.cpp'; else $(CYGPATH_W) '$(srcdir)/UndoManager.cpp'; fi`
|
||||
|
||||
audacity-VoiceKey.o: VoiceKey.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT audacity-VoiceKey.o -MD -MP -MF $(DEPDIR)/audacity-VoiceKey.Tpo -c -o audacity-VoiceKey.o `test -f 'VoiceKey.cpp' || echo '$(srcdir)/'`VoiceKey.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/audacity-VoiceKey.Tpo $(DEPDIR)/audacity-VoiceKey.Po
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='VoiceKey.cpp' object='audacity-VoiceKey.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o audacity-VoiceKey.o `test -f 'VoiceKey.cpp' || echo '$(srcdir)/'`VoiceKey.cpp
|
||||
|
||||
@ -74,7 +74,6 @@ simplifies construction of menu items.
|
||||
#include "LoadModules.h"
|
||||
#include "Prefs.h"
|
||||
#include "Printing.h"
|
||||
#include "UploadDialog.h"
|
||||
#ifdef USE_MIDI
|
||||
#include "NoteTrack.h"
|
||||
#endif // USE_MIDI
|
||||
@ -291,11 +290,6 @@ void AudacityProject::CreateMenusAndCommands()
|
||||
AudioIONotBusyFlag);
|
||||
c->AddItem(wxT("EditChains"), _("Edit C&hains..."), FN(OnEditChains));
|
||||
|
||||
#ifdef EXPERIMENTAL_FTP
|
||||
c->AddSeparator();
|
||||
c->AddItem(wxT("Upload File"), _("&Upload File..."), FN(OnUpload));
|
||||
#endif
|
||||
|
||||
c->AddSeparator();
|
||||
|
||||
c->AddItem(wxT("PageSetup"), _("Pa&ge Setup..."), FN(OnPageSetup),
|
||||
@ -2874,17 +2868,6 @@ void AudacityProject::OnExit()
|
||||
QuitAudacity();
|
||||
}
|
||||
|
||||
#ifdef EXPERIMENTAL_FTP
|
||||
void AudacityProject::OnUpload()
|
||||
{
|
||||
//if (mTags->ShowEditDialog(this, wxT("Edit ID3 Tags (for MP3 exporting)")))
|
||||
// PushState(wxT("Edit ID3 Tags"), wxT("Edit ID3 Tags"));
|
||||
|
||||
UploadDialog dlog(this);
|
||||
dlog.ShowModal();
|
||||
}
|
||||
#endif
|
||||
|
||||
void AudacityProject::OnExportLabels()
|
||||
{
|
||||
Track *t;
|
||||
|
||||
@ -189,10 +189,6 @@ void OnExportMultiple();
|
||||
void OnExportLabels();
|
||||
void OnExportMIDI();
|
||||
|
||||
#ifdef EXPERIMENTAL_FTP
|
||||
void OnUpload();
|
||||
#endif
|
||||
|
||||
void OnPreferences();
|
||||
|
||||
void OnPageSetup();
|
||||
|
||||
1454
src/UploadDialog.cpp
1454
src/UploadDialog.cpp
File diff suppressed because it is too large
Load Diff
@ -1,139 +0,0 @@
|
||||
/**********************************************************************
|
||||
|
||||
Audacity: A Digital Audio Editor
|
||||
|
||||
AboutDialog.h
|
||||
|
||||
Mike Underwood
|
||||
|
||||
**********************************************************************/
|
||||
|
||||
#ifndef __AUDACITY_UPLOAD_DLG__
|
||||
#define __AUDACITY_UPLOAD_DLG__
|
||||
|
||||
#include <wx/dialog.h>
|
||||
#include <wx/protocol/ftp.h>
|
||||
#include <wx/combobox.h>
|
||||
#include <wx/textfile.h>
|
||||
|
||||
#include "widgets/ProgressDialog.h"
|
||||
|
||||
#define wxID_FTPNAME 1000
|
||||
#define wxID_FTPHOST 1001
|
||||
#define wxID_FTPUSER 1002
|
||||
#define wxID_FTPPASS 1003
|
||||
#define wxID_SAVEFTP 1004
|
||||
#define wxID_USEPASV 1005
|
||||
#define wxID_CONNECT 1006
|
||||
#define wxID_DISCONNECT 1007
|
||||
#define wxID_UPLOAD_FILE 1008
|
||||
#define wxID_UPLOAD_DIR 1009
|
||||
#define wxID_STATUSBAR 1010
|
||||
#define wxID_SITELIST 1011
|
||||
#define wxID_FILEMANAGER 1012
|
||||
#define wxID_CREATEDIR 1013
|
||||
#define wxID_NEWSITE 1014
|
||||
#define wxID_DELSITE 1015
|
||||
|
||||
#define wxID_POPUP_DOWNLOAD 2000
|
||||
#define wxID_POPUP_RENAME 2001
|
||||
#define wxID_POPUP_DELETE 2002
|
||||
|
||||
#define CHUNKSIZE 128
|
||||
|
||||
class wxBoxSizer;
|
||||
class wxButton;
|
||||
class wxCheckBox;
|
||||
class wxListView;
|
||||
class wxTextCtrl;
|
||||
class wxFTP;
|
||||
class wxStatusBar;
|
||||
|
||||
class UploadDialog:public wxDialog {
|
||||
DECLARE_DYNAMIC_CLASS(UploadDialog)
|
||||
|
||||
public:
|
||||
UploadDialog(wxWindow * parent);
|
||||
virtual ~ UploadDialog();
|
||||
|
||||
void OnCancel(wxCommandEvent & event);
|
||||
void OnConnect(wxCommandEvent & event);
|
||||
void OnDisconnect(wxCommandEvent & event);
|
||||
void OnUploadFile(wxCommandEvent & event);
|
||||
void OnUploadDir(wxCommandEvent & event);
|
||||
void OnCreateDir(wxCommandEvent & event);
|
||||
void OnActivateItem (wxListEvent &event);
|
||||
void OnActivateSite (wxListEvent &event);
|
||||
void OnListRightClick (wxListEvent & event);
|
||||
void OnPopupMenu (wxCommandEvent & event);
|
||||
void OnNewSite (wxCommandEvent & event);
|
||||
void OnDeleteSite (wxCommandEvent &event);
|
||||
void OnFtpChange(wxCommandEvent & event);
|
||||
void OnSelectSite (wxListEvent &event);
|
||||
void OnCharPress (wxKeyEvent &event);
|
||||
|
||||
void GetDirContents(void);
|
||||
void RefreshFiles(void);
|
||||
void ExtractListData (wxString string, wxArrayString *results);
|
||||
|
||||
bool SaveFtpSite(wxString name, wxString host, wxString user, wxString pass);
|
||||
void LoadFtpSiteList (void);
|
||||
void UpdateSiteList (void);
|
||||
|
||||
void DownloadItem (wxString &src, wxString &dest, bool dir, bool multi);
|
||||
void DownloadItem (wxString &src, bool dir);
|
||||
void DownloadMultipleItems(void);
|
||||
void DownloadFile (wxString src, wxString dest);
|
||||
void DownloadDir (wxString src, wxString dest);
|
||||
|
||||
void GetDeleteList (wxString src);
|
||||
void RemoveItems(wxArrayString *files, wxArrayString *dirs);
|
||||
void UploadFile(wxString src, wxString dest);
|
||||
void UploadDir (wxString src, wxString dest);
|
||||
|
||||
wxBoxSizer *topsizer;
|
||||
wxButton *btnConnect;
|
||||
wxButton *btnDisconnect;
|
||||
wxButton *btnUploadFile;
|
||||
wxButton *btnUploadDir;
|
||||
wxButton *btnCreateDir;
|
||||
|
||||
wxButton *btnNewSite;
|
||||
wxButton *btnDelSite;
|
||||
|
||||
wxCheckBox *cbSave;
|
||||
wxCheckBox *cbPasv;
|
||||
wxImageList *icons;
|
||||
wxListView *siteList;
|
||||
wxListView *fileManager;
|
||||
wxTextCtrl *txtFtpName;
|
||||
wxTextCtrl *txtFtpHost;
|
||||
wxTextCtrl *txtFtpUser;
|
||||
wxTextCtrl *txtFtpPass;
|
||||
wxFTP *ftp;
|
||||
wxPoint mousePos;
|
||||
|
||||
wxArrayString *filenameList;
|
||||
wxArrayString *filepermList;
|
||||
wxArrayString *filesizeList;
|
||||
wxArrayString *dirnameList;
|
||||
wxArrayString *dirpermList;
|
||||
wxArrayString *dirsizeList;
|
||||
wxArrayString *displayNames;
|
||||
wxArrayString *displayPerm;
|
||||
wxArrayString *displaySizes;
|
||||
wxArrayString *deleteFileList;
|
||||
wxArrayString *deleteDirList;
|
||||
wxArrayString *ftpList;
|
||||
|
||||
ProgressDialog *mProgress;
|
||||
|
||||
long listIndex;
|
||||
long ftpIndex;
|
||||
long currentFtp;
|
||||
bool abort;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -828,14 +828,6 @@
|
||||
RelativePath="..\..\..\src\UndoManager.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\UploadDialog.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\UploadDialog.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\ViewInfo.h"
|
||||
>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user