Ticket #5063: mythvideo.diff
File mythvideo.diff, 9.7 KB (added by , 16 years ago) |
---|
-
mythplugins/mythvideo/mtd/jobthread.cpp
1342 1342 } 1343 1343 1344 1344 // Debugging 1345 // 1346 //cout << "About to run \"" << tc_process->arguments().join(" ") << "\"" << endl; 1347 //cout << "with workdir = " << tc_process->workingDirectory().path() << endl; 1345 /* 1346 VERBOSE(VB_IMPORTANT, QString("About to run '%1'\nwith workdir = %2") 1347 .arg(tc_process->arguments().join(" ")) 1348 .arg(tc_process->workingDirectory().path())); 1349 */ 1348 1350 1349 1351 if(!tc_process->start()) 1350 1352 { -
mythplugins/mythvideo/mtd/mtd.cpp
282 282 concurrent_transcodings--; 283 283 if(concurrent_transcodings < 0) 284 284 { 285 cerr << "mtd.o: Your number of transcode jobs ended up negative. That should be impossible." << endl;285 VERBOSE(VB_IMPORTANT, "mtd.o: Your number of transcode jobs ended up negative. That should be impossible."); 286 286 concurrent_transcodings = 0; 287 287 } 288 288 concurrent_transcodings_mutex->unlock(); … … 420 420 { 421 421 QString message = what; 422 422 message.append("\n"); 423 // cout << "Sending : " << message.local8Bit();423 // VERBOSE(VB_IMPORTANT, "Sending : " << message.local8Bit()); 424 424 where->writeBlock(message.utf8(), message.utf8().length()); 425 425 } 426 426 … … 774 774 775 775 if(!which_title) 776 776 { 777 cerr << "mtd.o: title number not valid? " << endl;777 VERBOSE(VB_IMPORTANT, "mtd.o: title number not valid? "); 778 778 return; 779 779 } 780 780 … … 805 805 } 806 806 else 807 807 { 808 cerr << "mtd.o: Hmmmmm. Got sent a job with a negative quality parameter. That's just plain weird." << endl;808 VERBOSE(VB_IMPORTANT, "mtd.o: Hmmmmm. Got sent a job with a negative quality parameter. That's just plain weird."); 809 809 } 810 810 } 811 811 … … 996 996 } 997 997 else 998 998 { 999 cerr << "mtd.o: receiving events I don't understand" << endl;999 VERBOSE(VB_IMPORTANT, "mtd.o: receiving events I don't understand"); 1000 1000 } 1001 1001 } 1002 1002 -
mythplugins/mythvideo/mtd/main.cpp
59 59 if(special_port < 1 || 60 60 special_port > 65534) 61 61 { 62 cerr << "mtd: Bad port number" << endl;62 VERBOSE(VB_IMPORTANT, "mtd: Bad port number"); 63 63 return FRONTEND_EXIT_INVALID_CMDLINE; 64 64 } 65 65 } 66 66 else 67 67 { 68 cerr << "mtd: Missing argument to -p/--port option\n";68 VERBOSE(VB_IMPORTANT, "mtd: Missing argument to -p/--port option"); 69 69 return FRONTEND_EXIT_INVALID_CMDLINE; 70 70 } 71 71 } -
mythplugins/mythvideo/mythvideo/main.cpp
423 423 startDVDRipper(); 424 424 break; 425 425 default: 426 cerr << "mythdvd main.o: handleMedia() does not know what to do" 427 << endl; 426 VERBOSE(VB_IMPORTANT, "mythdvd main.o: handleMedia() does not know what to do"); 428 427 } 429 428 } 430 429 -
mythplugins/mythvideo/mythvideo/dvdripbox.cpp
273 273 } 274 274 else 275 275 { 276 cerr << "dvdripbox.o: Can't get a reasonable port number" << endl;276 VERBOSE(VB_IMPORTANT, "dvdripbox.o: Can't get a reasonable port number"); 277 277 exit(0); 278 278 } 279 279 } … … 453 453 line_from_server = line_from_server.replace( QRegExp("\n"), "" ); 454 454 line_from_server = line_from_server.replace( QRegExp("\r"), "" ); 455 455 line_from_server.simplifyWhiteSpace(); 456 // cout << "Getting \"" << line_from_server.local8Bit() << "\"" << endl;456 // VERBOSE(VB_IMPORTANT, QString("Getting '%1'").arg(line_from_server.local8Bit())); 457 457 QStringList tokens = QStringList::split(" ", line_from_server); 458 458 if(tokens.count() > 0) 459 459 { … … 555 555 556 556 if(tokens.count() < 3) 557 557 { 558 cerr << "dvdripbox.o: I got an mtd status update with a bad number of tokens" << endl;558 VERBOSE(VB_IMPORTANT, "dvdripbox.o: I got an mtd status update with a bad number of tokens"); 559 559 return; 560 560 } 561 561 … … 691 691 692 692 if(tokens.count() < 6) 693 693 { 694 cerr << "dvdripbox.o: got wrong number of tokens on a DVD job." << endl;694 VERBOSE(VB_IMPORTANT, "dvdripbox.o: got wrong number of tokens on a DVD job."); 695 695 return; // exit(0) ? 696 696 } 697 697 else if(tokens[2] == "job" && tokens[4] == "overall") … … 722 722 } 723 723 else 724 724 { 725 cerr << "dvdripbox.o: Getting stuff I don't understand from the mtd" << endl;725 VERBOSE(VB_IMPORTANT, "dvdripbox.o: Getting stuff I don't understand from the mtd"); 726 726 } 727 727 728 728 } … … 735 735 736 736 if(tokens.count() < 3) 737 737 { 738 cerr << "dvdripbox.o: I got an mtd media update with a bad number of tokens" << endl;738 VERBOSE(VB_IMPORTANT, "dvdripbox.o: I got an mtd media update with a bad number of tokens"); 739 739 return; 740 740 } 741 741 … … 822 822 { 823 823 if(tokens.count() != 10) 824 824 { 825 cerr << "dvdripbox.o: Got wrong number of tokens in media title report." << endl;825 VERBOSE(VB_IMPORTANT, "dvdripbox.o: Got wrong number of tokens in media title report."); 826 826 return; 827 827 } 828 828 else … … 842 842 DVDTitleInfo *which_title = dvd_info->getTitle(tokens[3].toUInt()); 843 843 if(!which_title) 844 844 { 845 cerr << "dvdripbox.o: Asked to add an audio track for a title that doesn't exist" << endl;845 VERBOSE(VB_IMPORTANT, "dvdripbox.o: Asked to add an audio track for a title that doesn't exist"); 846 846 return; 847 847 } 848 848 … … 865 865 DVDTitleInfo *which_title = dvd_info->getTitle(tokens[3].toUInt()); 866 866 if(!which_title) 867 867 { 868 cerr << "dvdripbox.o: Asked to add a subtitle for a title that doesn't exist" << endl;868 VERBOSE(VB_IMPORTANT, "dvdripbox.o: Asked to add a subtitle for a title that doesn't exist"); 869 869 return; 870 870 } 871 871 … … 890 890 { 891 891 if(job_number + 1 > (int) jobs.count()) 892 892 { 893 cerr << "dvdripbox.o: mtd job summary didn't tell us the right number of jobs" << endl; 894 cerr << " (int) jobs.count() is " << (int) jobs.count() << endl; 895 cerr << " requested job_number was " << job_number << endl ; 893 VERBOSE(VB_IMPORTANT, QString( 894 "dvdripbox.o: mtd job summary didn't tell us the right number of jobs\n" 895 " (int) jobs.count() is %1\n" 896 " requested job_number was %2") 897 .arg((int) jobs.count()) 898 .arg(job_number)); 896 899 } 897 900 else 898 901 { … … 907 910 { 908 911 if(job_number + 1 > (int) jobs.count()) 909 912 { 910 cerr << "dvdripbox.o: mtd job summary didn't tell us the right number of jobs. The Bastard!" << endl;913 VERBOSE(VB_IMPORTANT, "dvdripbox.o: mtd job summary didn't tell us the right number of jobs. The Bastard!"); 911 914 } 912 915 else 913 916 { … … 1008 1011 warning_text = getUITextType("warning"); 1009 1012 if(!warning_text) 1010 1013 { 1011 cerr << "dvdripbox.o: Couldn't find a text type called warning in your theme" << endl;1014 VERBOSE(VB_IMPORTANT, "dvdripbox.o: Couldn't find a text type called warning in your theme"); 1012 1015 exit(0); 1013 1016 } 1014 1017 -
mythplugins/mythvideo/mythvideo/titledialog.cpp
159 159 } 160 160 else 161 161 { 162 cerr << "titledialog.o: Hmmmm .... should not have shown you this dialog." << endl;162 VERBOSE(VB_IMPORTANT, "titledialog.o: Hmmmm .... should not have shown you this dialog."); 163 163 } 164 164 } 165 165 … … 313 313 QString player_string = gContext->GetSetting("TitlePlayCommand"); 314 314 if(player_string.length() < 1) 315 315 { 316 cerr << "titledialog.o: No title player command defined" << endl;316 VERBOSE(VB_IMPORTANT, "titledialog.o: No title player command defined"); 317 317 return; 318 318 } 319 319 … … 354 354 player_string += player_append; 355 355 } 356 356 } 357 // cout << "PLAYER STRING: " << player_string << endl;357 // VERBOSE(VB_IMPORTANT, QString("PLAYER STRING: %1").arg(player_string)); 358 358 359 359 myth_system(player_string); 360 360 gContext->GetMainWindow()->raise(); … … 414 414 415 415 if(destination_directory.length() < 1) 416 416 { 417 cerr << "titledialog.o: I can't rip, as I have nowhere to put finished files. MythVideo installed?" << endl;417 VERBOSE(VB_IMPORTANT, "titledialog.o: I can't rip, as I have nowhere to put finished files. MythVideo installed?"); 418 418 return; 419 419 } 420 420