Ticket #4270: 4270-plugins-v1.patch
File 4270-plugins-v1.patch, 11.0 KB (added by , 16 years ago) |
---|
-
configure
471 471 fi 472 472 fi 473 473 474 if test "$paranoia" = "no" -a "$targetos" != "Darwin" ; then474 if test "$paranoia" = "no" -a "$targetos" != "Darwin" -a "$targetos" != "MINGW32_NT-6.0"; then 475 475 echo "MythMusic requires CDDA Paranoia." 476 476 fi 477 477 … … 489 489 echo "MythMusic requires taglib 1.4." 490 490 fi 491 491 492 if test "$targetos" != "Darwin" ; then492 if test "$targetos" != "Darwin" -a "$targetos" != "MINGW32_NT-6.0" ; then 493 493 if test "$cdaudio" = "no" -o "$paranoia" = "no" ; then 494 494 cdlibs="no" 495 495 fi -
mythmusic/mythmusic/playbackbox.cpp
15 15 #include <mythtv/lcddevice.h> 16 16 #include <mythtv/mythmedia.h> 17 17 #include <mythtv/audiooutput.h> 18 #include <mythtv/compat.h> 18 19 19 20 // MythMusic includes 20 21 #include "metadata.h" 21 22 #include "constants.h" 22 23 #include "streaminput.h" 23 24 #include "decoder.h" 24 #include "cddecoder.h"25 25 #include "playbackbox.h" 26 26 #include "databasebox.h" 27 27 #include "mainvisual.h" 28 28 #include "smartplaylist.h" 29 29 #include "search.h" 30 30 31 #ifndef CONFIG_MINGW 32 #include "cddecoder.h" 33 #endif 34 31 35 PlaybackBoxMusic::PlaybackBoxMusic(MythMainWindow *parent, QString window_name, 32 36 QString theme_filename, const QString &dev, const char *name) 33 37 -
mythmusic/mythmusic/synaesthesia.cpp
26 26 #include <iostream> 27 27 using namespace std; 28 28 29 #include <mythtv/compat.h> 30 29 31 Synaesthesia::Synaesthesia(long int winid) 30 32 { 31 33 fps = 29; -
mythmusic/mythmusic/mythmusic.pro
68 68 QMAKE_LFLAGS += -flat_namespace -undefined error 69 69 } 70 70 71 mingw { 72 DEFINES += USING_MINGW 73 74 HEADERS -= cdrip.h importmusic.h 75 SOURCES -= cdrip.cpp importmusic.cpp cddecoder.cpp 76 77 LIBS += -logg 78 } -
mythmusic/mythmusic/globalsettings.cpp
16 16 17 17 // mythtv 18 18 #include <mythtv/util.h> 19 #include <mythtv/compat.h> 19 20 20 21 // mythmusic 21 22 #include "globalsettings.h" -
mythmusic/mythmusic/playlist.cpp
8 8 #include <mythtv/mythcontext.h> 9 9 #include "smartplaylist.h" 10 10 #include <mythtv/mythdbcon.h> 11 #include <mythtv/compat.h> 11 12 12 13 #include <qfileinfo.h> 13 14 #include <qprocess.h> -
mythmusic/mythmusic/decoder.cpp
191 191 Decoder::registerFactory(new VorbisDecoderFactory); 192 192 Decoder::registerFactory(new MadDecoderFactory); 193 193 Decoder::registerFactory(new FlacDecoderFactory); 194 #ifndef CONFIG_MINGW 194 195 Decoder::registerFactory(new CdDecoderFactory); 196 #endif 195 197 Decoder::registerFactory(new avfDecoderFactory); 196 198 #ifdef AAC_SUPPORT 197 199 Decoder::registerFactory(new aacDecoderFactory); -
mythmusic/mythmusic/bumpscope.cpp
1 1 #include "mainvisual.h" 2 2 #include "bumpscope.h" 3 3 4 #include <mythtv/compat.h> 5 4 6 // This was: 5 7 // Bump Scope - Visualization Plugin for XMMS 6 8 // Copyright (C) 1999-2001 Zinx Verituse -
mythmusic/mythmusic/avfdecoder.cpp
31 31 32 32 #include <mythtv/mythcontext.h> 33 33 34 typedef struct {35 uint32_t v1;36 uint16_t v2;37 uint16_t v3;38 uint8_t v4[8];39 } GUID;40 41 34 avfDecoder::avfDecoder(const QString &file, DecoderFactory *d, QIODevice *i, 42 35 AudioOutput *o) 43 36 : Decoder(d, i, o) -
mythmusic/mythmusic/databasebox.cpp
24 24 #include "cddecoder.h" 25 25 #include "playlist.h" 26 26 #include "musicplayer.h" 27 #ifndef CONFIG_MINGW 28 #include "cddecoder.h" 29 #endif 27 30 28 31 DatabaseBox::DatabaseBox(MythMainWindow *parent, 29 32 const QString dev, const QString &window_name, … … 1260 1263 1261 1264 void ReadCDThread::run() 1262 1265 { 1266 #ifndef CONFIG_MINGW 1263 1267 // lock all_music and cd_status_changed while running thread 1264 1268 QMutexLocker locker(getLock()); 1265 1269 … … 1347 1351 } 1348 1352 1349 1353 delete decoder; 1354 #endif 1350 1355 } 1351 1356 -
mythmusic/mythmusic/main.cpp
15 15 #include <mythtv/mythdbcon.h> 16 16 #include <mythtv/mythpluginapi.h> 17 17 #include <mythtv/libmythui/myththemedmenu.h> 18 #include <mythtv/compat.h> 18 19 19 20 // MythMusic headers 20 21 #include "decoder.h" … … 23 24 #include "vorbisdecoder.h" 24 25 #include "databasebox.h" 25 26 #include "playbackbox.h" 26 #include "cdrip.h"27 27 #include "playlist.h" 28 28 #include "globalsettings.h" 29 29 #include "dbcheck.h" 30 #include "importmusic.h"31 30 #include "filescanner.h" 32 31 #include "musicplayer.h" 33 32 #include "config.h" 33 #ifndef CONFIG_MINGW 34 #include "cdrip.h" 35 #include "importmusic.h" 36 #endif 34 37 35 38 // System header (relies on config.h define) 36 39 #ifdef HAVE_CDAUDIO … … 171 174 172 175 bool startRipper(void) 173 176 { 177 #ifndef CONFIG_MINGW 174 178 Ripper rip(chooseCD(), gContext->GetMainWindow(), "cd ripper"); 175 179 176 180 qApp->unlock(); … … 179 183 180 184 if (rip.somethingWasRipped()) 181 185 return true; 182 186 #endif 183 187 return false; 184 188 } 185 189 186 190 bool startImport(void) 187 191 { 192 #ifndef CONFIG_MINGW 188 193 ImportMusicDialog import(gContext->GetMainWindow(), "import music"); 189 194 190 195 qApp->unlock(); … … 193 198 194 199 if (import.somethingWasImported()) 195 200 return true; 196 201 #endif 197 202 return false; 198 203 } 199 204 -
mythmusic/mythmusic/mainvisual.cpp
149 149 { 150 150 if (pVisFactory->name() == visName) 151 151 { 152 vis = pVisFactory->create(this, winId(), pluginName);152 vis = pVisFactory->create(this, (long int) winId(), pluginName); 153 153 vis->resize(size()); 154 154 fps = vis->getDesiredFPS(); 155 155 break; -
mythmusic/mythmusic/libvisualplugin.cpp
3 3 using namespace std; 4 4 5 5 #include <mythtv/mythcontext.h> 6 #include <mythtv/compat.h> 6 7 7 8 #include "libvisualplugin.h" 8 9 -
mythmusic/mythmusic/goom/goom_core.c
2 2 #include <stdio.h> 3 3 #include <string.h> 4 4 5 #include " config.h"5 #include "../config.h" 6 6 #ifdef HAVE_STDINT_H 7 7 #include <stdint.h> 8 8 #endif … … 126 126 buffsize = resx * resy; 127 127 128 128 pixel = (guint32 *) malloc (buffsize * sizeof (guint32) + 128); 129 bzero (pixel, buffsize * sizeof (guint32) + 128);129 memset (pixel, 0, buffsize * sizeof (guint32) + 128); 130 130 back = (guint32 *) malloc (buffsize * sizeof (guint32) + 128); 131 bzero (back,buffsize * sizeof (guint32) + 128);131 memset (back, 0, buffsize * sizeof (guint32) + 128); 132 132 p1 = (guint32 *) ((1 + ((uintptr_t) (pixel)) / 128) * 128); 133 133 p2 = (guint32 *) ((1 + ((uintptr_t) (back)) / 128) * 128); 134 134 -
mythmusic/mythmusic/metaiooggvorbiscomment.cpp
1 #include <iostream> 1 // POSIX headers 2 2 #include <unistd.h> 3 3 #include <sys/stat.h> 4 #include <math.h> 4 5 // C headers 6 #include <cmath> 7 8 // C++ headers 9 #include <iostream> 5 10 using namespace std; 6 11 12 // MythTV headers 13 #include <mythtv/compat.h> 14 #include <mythtv/util.h> 15 16 // MythMusic headers 7 17 #include "metaiooggvorbiscomment.h" 8 18 #include "metaiovorbiscomment.h" 9 19 #include "metadata.h" 10 20 #include "vcedit.h" 11 21 #include <vorbis/vorbisfile.h> 22 #include <qfileinfo.h> 12 23 13 14 24 //========================================================================== 15 25 MetaIOOggVorbisComment::MetaIOOggVorbisComment(void) 16 26 : MetaIO(".ogg") … … 186 196 187 197 if (!p_input) 188 198 return false; 189 190 // This may not be the neatest way to create a temporary file....191 QString newfilename = mdata->Filename() + ".XXXXXX";192 char* tmp = new char[newfilename.length()+1];193 strncpy(tmp, newfilename, newfilename.length());194 tmp[newfilename.length()] = '\0';195 196 int fd = mkstemp(tmp);197 if (fd < 1)198 {199 delete[] tmp;200 fclose(p_input);201 return false;202 }203 204 // We need a FILE* not a file descriptor....205 FILE* p_output = fdopen(fd, "wb");206 newfilename = tmp;207 199 200 QString newfilename = createTempFile( 201 mdata->Filename().local8Bit() + ".XXXXXX"); 202 203 FILE *p_output = fopen(newfilename, "wb"); 204 208 205 if (!p_output) 209 206 { 210 207 fclose(p_input); -
settings.pro
8 8 9 9 LIBS *= -L$${PREFIX}/lib 10 10 11 isEmpty(TARGET_OS) : win32 { 12 CONFIG += mingw 13 LIBS += -L/bin -lmyth-0.20 -lmythui-0.20 -lmythtv-0.20 14 LIBS += -lmythavformat-0.20 -lmythavcodec-0.20 -lmythavutil-0.20 15 } 16 11 17 DEFINES += _GNU_SOURCE 12 18 DEFINES += PREFIX=\"$${PREFIX}\" 13 19 -
mythgallery/mythgallery/qtiffio.cpp
17 17 // 18 18 19 19 #include <stdio.h> 20 #ifndef CONFIG_MINGW 20 21 #include <sys/mman.h> 22 #else 23 #define MAP_FAILED -1 24 #endif 21 25 22 26 #include <tiffio.h> 23 27 #include <qimage.h>