-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi
Attached the patch for the version I intend to upload. Please respond if you don't want this NMU to happen, if you are working yourself on a patch or if you think that the attached patch won't work. Cheers Luk -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQFDQ57T5UTeB5t8Mo0RAs6MAKC75oCes1PrOC/6efci5Qa409CAaQCfVBBE XuWvoGP94ocqI053OR35OoY= =IKv9 -----END PGP SIGNATURE-----
diff -u freqtweak-0.6.1/debian/changelog freqtweak-0.6.1/debian/changelog --- freqtweak-0.6.1/debian/changelog +++ freqtweak-0.6.1/debian/changelog @@ -1,3 +1,13 @@ +freqtweak (0.6.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rebuild for the jack transition (Closes: #317195). + * Patch for unsigned int loses precision (Closes: #286146). + * Patch for src/FTjackSupport.cpp: diff CVS version 1.12 and 1.13 + as jack_set_server_dir is deprecated. + + -- Luk Claes <[EMAIL PROTECTED]> Wed, 5 Oct 2005 11:15:29 +0200 + freqtweak (0.6.1-1) unstable; urgency=low * New upstream version, with compilation fixes for bug #263437. only in patch2: unchanged: --- freqtweak-0.6.1.orig/src/FTjackSupport.cpp +++ freqtweak-0.6.1/src/FTjackSupport.cpp @@ -49,7 +49,7 @@ _name = name; - _jackdir = dir; + _jackserv = dir; } FTjackSupport::~FTjackSupport() @@ -74,12 +74,41 @@ */ bool FTjackSupport::init() { - char namebuf[100]; - if (!_jackdir.empty()) { - jack_set_server_dir (_jackdir.c_str()); +#ifdef HAVE_JACK_CLIENT_OPEN + // TODO: use jack_client_open + jack_options_t options = JackNullOption; + jack_status_t status; + const char *server_name = NULL; + + if (!_jackserv.empty()) { + server_name = _jackserv.c_str(); + } + + // jack_client_name = client_name; /* might be reset below */ + if (_name.empty()) { + _name = "freqtweak"; } + _jackClient = jack_client_open (_name.c_str(), options, &status, server_name); + + if (!_jackClient) { + fprintf (stderr, "JACK Error: No good client name or JACK server %s not running?\n", _jackserv.c_str()); + _inited = false; + return false; + } + + if (status & JackServerStarted) { + fprintf(stderr,"JACK server started\n"); + } + + if (status & JackNameNotUnique) { + _name = jack_get_client_name (_jackClient); + } + +#else + char namebuf[100]; + /* try to become a client of the JACK server */ if (_name.empty()) { // find a name predictably @@ -109,7 +138,7 @@ _inited = false; return false; } - +#endif /* tell the JACK server to call `process()' whenever there is work to be done. */ only in patch2: unchanged: --- freqtweak-0.6.1.orig/src/FTjackSupport.hpp +++ freqtweak-0.6.1/src/FTjackSupport.hpp @@ -118,7 +118,7 @@ int _activePathCount; //char _name[100]; - string _jackdir; + string _jackserv; bool _portsChanged; bool _activated; only in patch2: unchanged: --- freqtweak-0.6.1.orig/src/FTprocOrderDialog.cpp +++ freqtweak-0.6.1/src/FTprocOrderDialog.cpp @@ -210,7 +210,7 @@ for (; mod != mlist.end(); ++mod) { item.SetText (wxString::FromAscii ((*mod)->getName().c_str())); - item.SetData ((unsigned) (*mod)); + item.SetData ((unsigned long) (*mod)); item.SetId(pos++); _sourceList->InsertItem(item); @@ -230,7 +230,7 @@ for (unsigned int n=0; n < procmods.size(); ++n) { item.SetText (wxString::FromAscii (procmods[n]->getName().c_str())); - item.SetData ((unsigned) procmods[n]); + item.SetData ((unsigned long) procmods[n]); item.SetId (n); _targetList->InsertItem(item); @@ -441,7 +441,7 @@ if (proc) { item.SetText (wxString::FromAscii (proc->getName().c_str())); - item.SetData ((unsigned)proc); + item.SetData ((unsigned long)proc); item.SetId (_targetList->GetItemCount()); _targetList->InsertItem(item);