yoshy - 0.2.0.1mod - 送信タイミング制御処理を一時無効化
@@ -90,7 +90,7 @@ | ||
90 | 90 | #define DUMMYAMP_HOOK_MODE _T("既存 Winamp API Emulator をフック中") |
91 | 91 | #define DUMMYAMP_STANDALONE_MODE _T("単独で Winamp API をエミュレート中") |
92 | 92 | #define DEBUG_SETTINGS_CAPTION "デバッグ用の設定" |
93 | -#define PLUGIN_VERSION "0.2.0.2" | |
93 | +#define PLUGIN_VERSION "0.2.0.1mod" | |
94 | 94 | |
95 | 95 | #define DEFAULT_DUMMYAMP_TITLE_FORMAT "[%artist% - ]$if(%title%,%title%,%_filename%)" |
96 | 96 |
@@ -124,7 +124,7 @@ | ||
124 | 124 | #define SEND_TIME_RATE_LOWERBOUND 33 |
125 | 125 | #define REQUIRED_MAXIMUM_TIME 20 |
126 | 126 | |
127 | -#define CONTROL_SEND_TIMING | |
127 | +//#define CONTROL_SEND_TIMING | |
128 | 128 | |
129 | 129 | //#define ENABLE_MSN |
130 | 130 |
@@ -2420,7 +2420,7 @@ | ||
2420 | 2420 | { |
2421 | 2421 | HANDLE hDirChangeNotify = DummyAmp::getInstance()->getDirChangeNotifyHandle(); |
2422 | 2422 | |
2423 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_ISPLAYING / status %d"), playStatus); | |
2423 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_ISPLAYING / status [%d]"), playStatus); | |
2424 | 2424 | |
2425 | 2425 | if(playStatus != PlayInfo::PLAY_START) |
2426 | 2426 | { |
@@ -2472,13 +2472,13 @@ | ||
2472 | 2472 | { |
2473 | 2473 | if(wp == IPC_GETOUTPUTTIME_PositionMSec) |
2474 | 2474 | { |
2475 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / position %d"), playPosition / 1000); | |
2475 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / position [%d sec.]"), playPosition / 1000); | |
2476 | 2476 | |
2477 | 2477 | return std::make_pair(true, playPosition); |
2478 | 2478 | } |
2479 | 2479 | else if(wp == IPC_GETOUTPUTTIME_TotalSec) |
2480 | 2480 | { |
2481 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / length %d"), playLength); | |
2481 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / length [%d sec.]"), playLength); | |
2482 | 2482 | return std::make_pair(true, playLength); |
2483 | 2483 | } |
2484 | 2484 | } |
@@ -2486,7 +2486,7 @@ | ||
2486 | 2486 | return std::make_pair(true, -1); |
2487 | 2487 | |
2488 | 2488 | case IPC_GETLISTPOS: |
2489 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETLISTPOS / index %d returned."), playCount); | |
2489 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETLISTPOS / index [%d]"), playCount); | |
2490 | 2490 | return std::make_pair(true, playCount); |
2491 | 2491 | |
2492 | 2492 | case IPC_GETPLAYLISTFILE: |
@@ -2495,7 +2495,7 @@ | ||
2495 | 2495 | if(isPlayInfoMp3Available == true) |
2496 | 2496 | { |
2497 | 2497 | DEBUG_DUMMYAMP_PROC8( |
2498 | - "DummyAmp::innerWinampWindowProc - IPC_GETPLAYLISTFILE / #%d - path [%s] returned.", | |
2498 | + "DummyAmp::innerWinampWindowProc - IPC_GETPLAYLISTFILE / #%d - path [%s]", | |
2499 | 2499 | playCount, (LPCSTR)playInfoMp3Path8); |
2500 | 2500 | |
2501 | 2501 | DummyAmp::getInstance()->setGetPlayListFileTime(playPosition); |
@@ -2632,7 +2632,7 @@ | ||
2632 | 2632 | switch(lp) |
2633 | 2633 | { |
2634 | 2634 | case IPC_ISPLAYING: |
2635 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_ISPLAYING / status %d"), rawPlayStatus); | |
2635 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_ISPLAYING / status [%d]"), rawPlayStatus); | |
2636 | 2636 | return std::make_pair(true, rawPlayStatus); |
2637 | 2637 | |
2638 | 2638 | case IPC_GETOUTPUTTIME: |
@@ -2653,12 +2653,12 @@ | ||
2653 | 2653 | |
2654 | 2654 | if(wp == IPC_GETOUTPUTTIME_PositionMSec) |
2655 | 2655 | { |
2656 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETOUTPUTTIME / position %.3f"), rawPlayPosition / 1000.0); | |
2656 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETOUTPUTTIME / position [%.3f sec.]"), rawPlayPosition / 1000.0); | |
2657 | 2657 | return std::make_pair(true, rawPlayPosition); |
2658 | 2658 | } |
2659 | 2659 | else if(wp == IPC_GETOUTPUTTIME_TotalSec) |
2660 | 2660 | { |
2661 | - TRACE_DUMMYAMP_PROC(_T("DummyAm::outerWinampWindowProcp - IPC_GETOUTPUTTIME / length %d"), rawPlayLength); | |
2661 | + TRACE_DUMMYAMP_PROC(_T("DummyAm::outerWinampWindowProcp - IPC_GETOUTPUTTIME / length [%d sec.]"), rawPlayLength); | |
2662 | 2662 | return std::make_pair(true, rawPlayLength); |
2663 | 2663 | } |
2664 | 2664 |
@@ -2665,17 +2665,17 @@ | ||
2665 | 2665 | return std::make_pair(true, -1); |
2666 | 2666 | |
2667 | 2667 | case IPC_GETLISTPOS: |
2668 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETLISTPOS / index %d returned."), rawPlayCount); | |
2668 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETLISTPOS / index [%d]"), rawPlayCount); | |
2669 | 2669 | return std::make_pair(true, rawPlayCount); |
2670 | 2670 | |
2671 | 2671 | case IPC_GETPLAYLISTFILE: |
2672 | 2672 | TRACE_DUMMYAMP_PROC8( |
2673 | - "DummyAmp::outerWinampWindowProc - IPC_GETPLAYLISTFILE / path [%s] returned.", (LPCSTR)rawPlayInfoMp3Path8); | |
2673 | + "DummyAmp::outerWinampWindowProc - IPC_GETPLAYLISTFILE / path [%s]", (LPCSTR)rawPlayInfoMp3Path8); | |
2674 | 2674 | return std::make_pair(true, (LRESULT)(LPCSTR)rawPlayInfoMp3Path8); |
2675 | 2675 | |
2676 | 2676 | case IPC_GETPLAYLISTTITLE: |
2677 | 2677 | TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETPLAYLISTTITLE") |
2678 | - _T(" / title [%s] returned."), (LPCTSTR)playlistTitle.c_str()); | |
2678 | + _T(" / title [%s]"), (LPCTSTR)playlistTitle.c_str()); | |
2679 | 2679 | return std::make_pair(true, (LRESULT)(LPCSTR)playlistTitle8); |
2680 | 2680 | |
2681 | 2681 | case IPC_JUMPTOTIME: |
@@ -2683,7 +2683,7 @@ | ||
2683 | 2683 | { |
2684 | 2684 | double jumpPos = wp / 1000.0; |
2685 | 2685 | TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_JUMPTOTIME") |
2686 | - _T(" / jump to %.3f[sec.]"), jumpPos); | |
2686 | + _T(" / jump to [%.3f sec.]"), jumpPos); | |
2687 | 2687 | |
2688 | 2688 | if(jumpPos > rawPlayLength) |
2689 | 2689 | { |
@@ -3214,8 +3214,10 @@ | ||
3214 | 3214 | return ; |
3215 | 3215 | } |
3216 | 3216 | |
3217 | +#if defined(CONTROL_SEND_TIMING) | |
3217 | 3218 | // reset send timing |
3218 | 3219 | resetSendTiming(); |
3220 | +#endif | |
3219 | 3221 | |
3220 | 3222 | // clear raw playinfo on dummyamp (no resent mode) |
3221 | 3223 | DummyAmp::getInstance()->getRawPlayInfo().clearPlayInfo(false); |
@@ -90,7 +90,7 @@ | ||
90 | 90 | #define DUMMYAMP_HOOK_MODE _T("既存 Winamp API Emulator をフック中") |
91 | 91 | #define DUMMYAMP_STANDALONE_MODE _T("単独で Winamp API をエミュレート中") |
92 | 92 | #define DEBUG_SETTINGS_CAPTION "デバッグ用の設定" |
93 | -#define PLUGIN_VERSION "0.2.0.2" | |
93 | +#define PLUGIN_VERSION "0.2.0.1mod" | |
94 | 94 | |
95 | 95 | #define DEFAULT_DUMMYAMP_TITLE_FORMAT "[%artist% - ]$if(%title%,%title%,%_filename%)" |
96 | 96 |
@@ -124,7 +124,7 @@ | ||
124 | 124 | #define SEND_TIME_RATE_LOWERBOUND 33 |
125 | 125 | #define REQUIRED_MAXIMUM_TIME 20 |
126 | 126 | |
127 | -#define CONTROL_SEND_TIMING | |
127 | +//#define CONTROL_SEND_TIMING | |
128 | 128 | |
129 | 129 | //#define ENABLE_MSN |
130 | 130 |
@@ -2420,7 +2420,7 @@ | ||
2420 | 2420 | { |
2421 | 2421 | HANDLE hDirChangeNotify = DummyAmp::getInstance()->getDirChangeNotifyHandle(); |
2422 | 2422 | |
2423 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_ISPLAYING / status %d"), playStatus); | |
2423 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_ISPLAYING / status [%d]"), playStatus); | |
2424 | 2424 | |
2425 | 2425 | if(playStatus != PlayInfo::PLAY_START) |
2426 | 2426 | { |
@@ -2472,13 +2472,13 @@ | ||
2472 | 2472 | { |
2473 | 2473 | if(wp == IPC_GETOUTPUTTIME_PositionMSec) |
2474 | 2474 | { |
2475 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / position %d"), playPosition / 1000); | |
2475 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / position [%d sec.]"), playPosition / 1000); | |
2476 | 2476 | |
2477 | 2477 | return std::make_pair(true, playPosition); |
2478 | 2478 | } |
2479 | 2479 | else if(wp == IPC_GETOUTPUTTIME_TotalSec) |
2480 | 2480 | { |
2481 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / length %d"), playLength); | |
2481 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / length [%d sec.]"), playLength); | |
2482 | 2482 | return std::make_pair(true, playLength); |
2483 | 2483 | } |
2484 | 2484 | } |
@@ -2486,7 +2486,7 @@ | ||
2486 | 2486 | return std::make_pair(true, -1); |
2487 | 2487 | |
2488 | 2488 | case IPC_GETLISTPOS: |
2489 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETLISTPOS / index %d returned."), playCount); | |
2489 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETLISTPOS / index [%d]"), playCount); | |
2490 | 2490 | return std::make_pair(true, playCount); |
2491 | 2491 | |
2492 | 2492 | case IPC_GETPLAYLISTFILE: |
@@ -2495,7 +2495,7 @@ | ||
2495 | 2495 | if(isPlayInfoMp3Available == true) |
2496 | 2496 | { |
2497 | 2497 | DEBUG_DUMMYAMP_PROC8( |
2498 | - "DummyAmp::innerWinampWindowProc - IPC_GETPLAYLISTFILE / #%d - path [%s] returned.", | |
2498 | + "DummyAmp::innerWinampWindowProc - IPC_GETPLAYLISTFILE / #%d - path [%s]", | |
2499 | 2499 | playCount, (LPCSTR)playInfoMp3Path8); |
2500 | 2500 | |
2501 | 2501 | DummyAmp::getInstance()->setGetPlayListFileTime(playPosition); |
@@ -2632,7 +2632,7 @@ | ||
2632 | 2632 | switch(lp) |
2633 | 2633 | { |
2634 | 2634 | case IPC_ISPLAYING: |
2635 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_ISPLAYING / status %d"), rawPlayStatus); | |
2635 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_ISPLAYING / status [%d]"), rawPlayStatus); | |
2636 | 2636 | return std::make_pair(true, rawPlayStatus); |
2637 | 2637 | |
2638 | 2638 | case IPC_GETOUTPUTTIME: |
@@ -2653,12 +2653,12 @@ | ||
2653 | 2653 | |
2654 | 2654 | if(wp == IPC_GETOUTPUTTIME_PositionMSec) |
2655 | 2655 | { |
2656 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETOUTPUTTIME / position %.3f"), rawPlayPosition / 1000.0); | |
2656 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETOUTPUTTIME / position [%.3f sec.]"), rawPlayPosition / 1000.0); | |
2657 | 2657 | return std::make_pair(true, rawPlayPosition); |
2658 | 2658 | } |
2659 | 2659 | else if(wp == IPC_GETOUTPUTTIME_TotalSec) |
2660 | 2660 | { |
2661 | - TRACE_DUMMYAMP_PROC(_T("DummyAm::outerWinampWindowProcp - IPC_GETOUTPUTTIME / length %d"), rawPlayLength); | |
2661 | + TRACE_DUMMYAMP_PROC(_T("DummyAm::outerWinampWindowProcp - IPC_GETOUTPUTTIME / length [%d sec.]"), rawPlayLength); | |
2662 | 2662 | return std::make_pair(true, rawPlayLength); |
2663 | 2663 | } |
2664 | 2664 |
@@ -2665,17 +2665,17 @@ | ||
2665 | 2665 | return std::make_pair(true, -1); |
2666 | 2666 | |
2667 | 2667 | case IPC_GETLISTPOS: |
2668 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETLISTPOS / index %d returned."), rawPlayCount); | |
2668 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETLISTPOS / index [%d]"), rawPlayCount); | |
2669 | 2669 | return std::make_pair(true, rawPlayCount); |
2670 | 2670 | |
2671 | 2671 | case IPC_GETPLAYLISTFILE: |
2672 | 2672 | TRACE_DUMMYAMP_PROC8( |
2673 | - "DummyAmp::outerWinampWindowProc - IPC_GETPLAYLISTFILE / path [%s] returned.", (LPCSTR)rawPlayInfoMp3Path8); | |
2673 | + "DummyAmp::outerWinampWindowProc - IPC_GETPLAYLISTFILE / path [%s]", (LPCSTR)rawPlayInfoMp3Path8); | |
2674 | 2674 | return std::make_pair(true, (LRESULT)(LPCSTR)rawPlayInfoMp3Path8); |
2675 | 2675 | |
2676 | 2676 | case IPC_GETPLAYLISTTITLE: |
2677 | 2677 | TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETPLAYLISTTITLE") |
2678 | - _T(" / title [%s] returned."), (LPCTSTR)playlistTitle.c_str()); | |
2678 | + _T(" / title [%s]"), (LPCTSTR)playlistTitle.c_str()); | |
2679 | 2679 | return std::make_pair(true, (LRESULT)(LPCSTR)playlistTitle8); |
2680 | 2680 | |
2681 | 2681 | case IPC_JUMPTOTIME: |
@@ -2683,7 +2683,7 @@ | ||
2683 | 2683 | { |
2684 | 2684 | double jumpPos = wp / 1000.0; |
2685 | 2685 | TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_JUMPTOTIME") |
2686 | - _T(" / jump to %.3f[sec.]"), jumpPos); | |
2686 | + _T(" / jump to [%.3f sec.]"), jumpPos); | |
2687 | 2687 | |
2688 | 2688 | if(jumpPos > rawPlayLength) |
2689 | 2689 | { |
@@ -3214,8 +3214,10 @@ | ||
3214 | 3214 | return ; |
3215 | 3215 | } |
3216 | 3216 | |
3217 | +#if defined(CONTROL_SEND_TIMING) | |
3217 | 3218 | // reset send timing |
3218 | 3219 | resetSendTiming(); |
3220 | +#endif | |
3219 | 3221 | |
3220 | 3222 | // clear raw playinfo on dummyamp (no resent mode) |
3221 | 3223 | DummyAmp::getInstance()->getRawPlayInfo().clearPlayInfo(false); |
@@ -90,7 +90,7 @@ | ||
90 | 90 | #define DUMMYAMP_HOOK_MODE _T("既存 Winamp API Emulator をフック中") |
91 | 91 | #define DUMMYAMP_STANDALONE_MODE _T("単独で Winamp API をエミュレート中") |
92 | 92 | #define DEBUG_SETTINGS_CAPTION "デバッグ用の設定" |
93 | -#define PLUGIN_VERSION "0.2.0.2" | |
93 | +#define PLUGIN_VERSION "0.2.0.1mod" | |
94 | 94 | |
95 | 95 | #define DEFAULT_DUMMYAMP_TITLE_FORMAT "[%artist% - ]$if(%title%,%title%,%_filename%)" |
96 | 96 |
@@ -124,7 +124,7 @@ | ||
124 | 124 | #define SEND_TIME_RATE_LOWERBOUND 33 |
125 | 125 | #define REQUIRED_MAXIMUM_TIME 20 |
126 | 126 | |
127 | -#define CONTROL_SEND_TIMING | |
127 | +//#define CONTROL_SEND_TIMING | |
128 | 128 | |
129 | 129 | //#define ENABLE_MSN |
130 | 130 |
@@ -2420,7 +2420,7 @@ | ||
2420 | 2420 | { |
2421 | 2421 | HANDLE hDirChangeNotify = DummyAmp::getInstance()->getDirChangeNotifyHandle(); |
2422 | 2422 | |
2423 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_ISPLAYING / status %d"), playStatus); | |
2423 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_ISPLAYING / status [%d]"), playStatus); | |
2424 | 2424 | |
2425 | 2425 | if(playStatus != PlayInfo::PLAY_START) |
2426 | 2426 | { |
@@ -2472,13 +2472,13 @@ | ||
2472 | 2472 | { |
2473 | 2473 | if(wp == IPC_GETOUTPUTTIME_PositionMSec) |
2474 | 2474 | { |
2475 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / position %d"), playPosition / 1000); | |
2475 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / position [%d sec.]"), playPosition / 1000); | |
2476 | 2476 | |
2477 | 2477 | return std::make_pair(true, playPosition); |
2478 | 2478 | } |
2479 | 2479 | else if(wp == IPC_GETOUTPUTTIME_TotalSec) |
2480 | 2480 | { |
2481 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / length %d"), playLength); | |
2481 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETOUTPUTTIME / length [%d sec.]"), playLength); | |
2482 | 2482 | return std::make_pair(true, playLength); |
2483 | 2483 | } |
2484 | 2484 | } |
@@ -2486,7 +2486,7 @@ | ||
2486 | 2486 | return std::make_pair(true, -1); |
2487 | 2487 | |
2488 | 2488 | case IPC_GETLISTPOS: |
2489 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETLISTPOS / index %d returned."), playCount); | |
2489 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::innerWinampWindowProc - IPC_GETLISTPOS / index [%d]"), playCount); | |
2490 | 2490 | return std::make_pair(true, playCount); |
2491 | 2491 | |
2492 | 2492 | case IPC_GETPLAYLISTFILE: |
@@ -2495,7 +2495,7 @@ | ||
2495 | 2495 | if(isPlayInfoMp3Available == true) |
2496 | 2496 | { |
2497 | 2497 | DEBUG_DUMMYAMP_PROC8( |
2498 | - "DummyAmp::innerWinampWindowProc - IPC_GETPLAYLISTFILE / #%d - path [%s] returned.", | |
2498 | + "DummyAmp::innerWinampWindowProc - IPC_GETPLAYLISTFILE / #%d - path [%s]", | |
2499 | 2499 | playCount, (LPCSTR)playInfoMp3Path8); |
2500 | 2500 | |
2501 | 2501 | DummyAmp::getInstance()->setGetPlayListFileTime(playPosition); |
@@ -2632,7 +2632,7 @@ | ||
2632 | 2632 | switch(lp) |
2633 | 2633 | { |
2634 | 2634 | case IPC_ISPLAYING: |
2635 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_ISPLAYING / status %d"), rawPlayStatus); | |
2635 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_ISPLAYING / status [%d]"), rawPlayStatus); | |
2636 | 2636 | return std::make_pair(true, rawPlayStatus); |
2637 | 2637 | |
2638 | 2638 | case IPC_GETOUTPUTTIME: |
@@ -2653,12 +2653,12 @@ | ||
2653 | 2653 | |
2654 | 2654 | if(wp == IPC_GETOUTPUTTIME_PositionMSec) |
2655 | 2655 | { |
2656 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETOUTPUTTIME / position %.3f"), rawPlayPosition / 1000.0); | |
2656 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETOUTPUTTIME / position [%.3f sec.]"), rawPlayPosition / 1000.0); | |
2657 | 2657 | return std::make_pair(true, rawPlayPosition); |
2658 | 2658 | } |
2659 | 2659 | else if(wp == IPC_GETOUTPUTTIME_TotalSec) |
2660 | 2660 | { |
2661 | - TRACE_DUMMYAMP_PROC(_T("DummyAm::outerWinampWindowProcp - IPC_GETOUTPUTTIME / length %d"), rawPlayLength); | |
2661 | + TRACE_DUMMYAMP_PROC(_T("DummyAm::outerWinampWindowProcp - IPC_GETOUTPUTTIME / length [%d sec.]"), rawPlayLength); | |
2662 | 2662 | return std::make_pair(true, rawPlayLength); |
2663 | 2663 | } |
2664 | 2664 |
@@ -2665,17 +2665,17 @@ | ||
2665 | 2665 | return std::make_pair(true, -1); |
2666 | 2666 | |
2667 | 2667 | case IPC_GETLISTPOS: |
2668 | - TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETLISTPOS / index %d returned."), rawPlayCount); | |
2668 | + TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETLISTPOS / index [%d]"), rawPlayCount); | |
2669 | 2669 | return std::make_pair(true, rawPlayCount); |
2670 | 2670 | |
2671 | 2671 | case IPC_GETPLAYLISTFILE: |
2672 | 2672 | TRACE_DUMMYAMP_PROC8( |
2673 | - "DummyAmp::outerWinampWindowProc - IPC_GETPLAYLISTFILE / path [%s] returned.", (LPCSTR)rawPlayInfoMp3Path8); | |
2673 | + "DummyAmp::outerWinampWindowProc - IPC_GETPLAYLISTFILE / path [%s]", (LPCSTR)rawPlayInfoMp3Path8); | |
2674 | 2674 | return std::make_pair(true, (LRESULT)(LPCSTR)rawPlayInfoMp3Path8); |
2675 | 2675 | |
2676 | 2676 | case IPC_GETPLAYLISTTITLE: |
2677 | 2677 | TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_GETPLAYLISTTITLE") |
2678 | - _T(" / title [%s] returned."), (LPCTSTR)playlistTitle.c_str()); | |
2678 | + _T(" / title [%s]"), (LPCTSTR)playlistTitle.c_str()); | |
2679 | 2679 | return std::make_pair(true, (LRESULT)(LPCSTR)playlistTitle8); |
2680 | 2680 | |
2681 | 2681 | case IPC_JUMPTOTIME: |
@@ -2683,7 +2683,7 @@ | ||
2683 | 2683 | { |
2684 | 2684 | double jumpPos = wp / 1000.0; |
2685 | 2685 | TRACE_DUMMYAMP_PROC(_T("DummyAmp::outerWinampWindowProc - IPC_JUMPTOTIME") |
2686 | - _T(" / jump to %.3f[sec.]"), jumpPos); | |
2686 | + _T(" / jump to [%.3f sec.]"), jumpPos); | |
2687 | 2687 | |
2688 | 2688 | if(jumpPos > rawPlayLength) |
2689 | 2689 | { |
@@ -3214,8 +3214,10 @@ | ||
3214 | 3214 | return ; |
3215 | 3215 | } |
3216 | 3216 | |
3217 | +#if defined(CONTROL_SEND_TIMING) | |
3217 | 3218 | // reset send timing |
3218 | 3219 | resetSendTiming(); |
3220 | +#endif | |
3219 | 3221 | |
3220 | 3222 | // clear raw playinfo on dummyamp (no resent mode) |
3221 | 3223 | DummyAmp::getInstance()->getRawPlayInfo().clearPlayInfo(false); |